mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 850927: Redundant doorhanger layout xml file. [r=mfinkle]
--HG-- extra : rebase_source : e32481672ca80b654a51237fe33250217e8cd1c3
This commit is contained in:
Sriram Ramasubramanian
parent
f6ee8f08eb
commit
a16febdfb1
@ -447,8 +447,6 @@ RES_LAYOUT_LAND_V14 = \
|
||||
RES_LAYOUT_LARGE_V11 = \
|
||||
res/layout-large-v11/awesomebar_search.xml \
|
||||
res/layout-large-v11/browser_toolbar_menu.xml \
|
||||
res/layout-large-v11/doorhangerpopup.xml \
|
||||
res/layout-large-v11/site_identity_popup.xml \
|
||||
$(NULL)
|
||||
|
||||
RES_LAYOUT_LARGE_LAND_V11 = \
|
||||
@ -499,6 +497,7 @@ RES_VALUES_LARGE_V11 = \
|
||||
res/values-large-v11/dimens.xml \
|
||||
res/values-large-v11/layout.xml \
|
||||
res/values-large-v11/styles.xml \
|
||||
res/values-large-v11/themes.xml \
|
||||
$(NULL)
|
||||
|
||||
RES_VALUES_LARGE_LAND_V11 = \
|
||||
|
||||
@ -156,7 +156,7 @@ public class SiteIdentityPopup extends PopupWindow {
|
||||
|
||||
int offset = 0;
|
||||
if (HardwareUtils.isTablet()) {
|
||||
int popupWidth = mResources.getDimensionPixelSize(R.dimen.popup_width);
|
||||
int popupWidth = mResources.getDimensionPixelSize(R.dimen.doorhanger_width);
|
||||
offset = 0 - popupWidth + arrowWidth*3/2 + v.getWidth()/2;
|
||||
}
|
||||
|
||||
|
||||
@ -1,30 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- This Source Code Form is subject to the terms of the Mozilla Public
|
||||
- License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
|
||||
|
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<ScrollView android:layout_width="@dimen/popup_width"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentTop="true"
|
||||
android:background="@drawable/doorhanger_popup_bg">
|
||||
|
||||
<LinearLayout android:id="@+id/doorhanger_container"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"/>
|
||||
|
||||
</ScrollView>
|
||||
|
||||
<ImageView android:id="@+id/doorhanger_arrow"
|
||||
android:layout_width="@dimen/menu_popup_arrow_width"
|
||||
android:layout_height="12dip"
|
||||
android:layout_marginLeft="4dip"
|
||||
android:layout_alignParentTop="true"
|
||||
android:src="@drawable/menu_popup_arrow_top"
|
||||
android:scaleType="fitXY"/>
|
||||
|
||||
</RelativeLayout>
|
||||
@ -1,68 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- This Source Code Form is subject to the terms of the Mozilla Public
|
||||
- License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
|
||||
|
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="@dimen/popup_width"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<LinearLayout android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
android:layout_alignParentTop="true"
|
||||
android:background="@drawable/doorhanger_popup_bg">
|
||||
|
||||
<LinearLayout android:layout_width="0dip"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1.0"
|
||||
android:orientation="vertical"
|
||||
android:padding="12dip">
|
||||
|
||||
<TextView android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textSize="12sp"
|
||||
android:textColor="@color/doorhanger_text"
|
||||
android:text="@string/identity_connected_to"/>
|
||||
|
||||
<TextView android:id="@+id/host"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textSize="18sp"/>
|
||||
|
||||
<TextView android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textSize="12sp"
|
||||
android:textColor="@color/doorhanger_text"
|
||||
android:text="@string/identity_run_by"
|
||||
android:paddingTop="12dip"/>
|
||||
|
||||
<TextView android:id="@+id/owner"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textSize="18sp"/>
|
||||
|
||||
<TextView android:id="@+id/verifier"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textSize="12sp"
|
||||
android:textColor="@color/doorhanger_text"
|
||||
android:paddingTop="12dip"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<ImageView android:id="@+id/larry"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:padding="15dip"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<ImageView android:id="@+id/arrow"
|
||||
android:layout_width="@dimen/menu_popup_arrow_width"
|
||||
android:layout_height="12dip"
|
||||
android:layout_alignParentTop="true"
|
||||
android:src="@drawable/menu_popup_arrow_top"
|
||||
android:scaleType="fitXY"/>
|
||||
|
||||
</RelativeLayout>
|
||||
@ -7,7 +7,7 @@
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<ScrollView android:layout_width="fill_parent"
|
||||
<ScrollView android:layout_width="?attr/doorhangerWidth"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentTop="true"
|
||||
android:background="@drawable/doorhanger_popup_bg">
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
|
||||
|
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_width="?attr/doorhangerWidth"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<LinearLayout android:layout_width="fill_parent"
|
||||
|
||||
19
mobile/android/base/resources/values-large-v11/themes.xml
Normal file
19
mobile/android/base/resources/values-large-v11/themes.xml
Normal file
@ -0,0 +1,19 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- This Source Code Form is subject to the terms of the Mozilla Public
|
||||
- License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
|
||||
|
||||
<resources>
|
||||
|
||||
<!--
|
||||
Base application theme. This could be overridden by GeckoBaseTheme
|
||||
in other res/values-XXX/themes.xml.
|
||||
-->
|
||||
<style name="GeckoBase" parent="@android:style/Theme.Holo.Light">
|
||||
<item name="android:windowContentOverlay">@null</item>
|
||||
<item name="android:windowActionBar">false</item>
|
||||
<item name="android:windowNoTitle">true</item>
|
||||
<item name="doorhangerWidth">@dimen/doorhanger_width</item>
|
||||
</style>
|
||||
|
||||
</resources>
|
||||
@ -13,6 +13,7 @@
|
||||
<item name="android:windowContentOverlay">@null</item>
|
||||
<item name="android:windowActionBar">false</item>
|
||||
<item name="android:windowNoTitle">true</item>
|
||||
<item name="doorhangerWidth">fill_parent</item>
|
||||
</style>
|
||||
|
||||
<style name="GeckoDialogBase" parent="@android:style/Theme.Holo.Dialog">
|
||||
|
||||
@ -11,6 +11,15 @@
|
||||
<attr name="more_text" format="string"/>
|
||||
</declare-styleable>
|
||||
|
||||
<!-- DoorHangers -->
|
||||
<declare-styleable name="DoorHanger">
|
||||
<attr name="doorhangerWidth" format="dimension">
|
||||
<enum name="fill_parent" value="-1" />
|
||||
<enum name="match_parent" value="-1" />
|
||||
<enum name="wrap_content" value="-2" />
|
||||
</attr>
|
||||
</declare-styleable>
|
||||
|
||||
<declare-styleable name="MenuItem">
|
||||
<attr name="android:id"/>
|
||||
<attr name="android:orderInCategory"/>
|
||||
|
||||
@ -33,6 +33,10 @@
|
||||
<dimen name="browser_toolbar_icon_width">36dp</dimen>
|
||||
<dimen name="browser_toolbar_lock_width">20dp</dimen>
|
||||
<dimen name="browser_toolbar_favicon_size">29.33dip</dimen>
|
||||
|
||||
<!-- Max width of the doorhanger on tablets -->
|
||||
<dimen name="doorhanger_width">400dp</dimen>
|
||||
|
||||
<dimen name="flow_layout_spacing">6dp</dimen>
|
||||
<dimen name="menu_item_icon">21dp</dimen>
|
||||
<dimen name="menu_item_state_icon">18dp</dimen>
|
||||
@ -52,7 +56,6 @@
|
||||
<dimen name="prompt_service_min_list_item_height">48dp</dimen>
|
||||
<dimen name="remote_tab_child_row_height">64dp</dimen>
|
||||
<dimen name="remote_tab_group_row_height">26dp</dimen>
|
||||
<dimen name="popup_width">400dp</dimen>
|
||||
<dimen name="tab_thumbnail_height">90dp</dimen>
|
||||
<dimen name="tab_thumbnail_width">160dp</dimen>
|
||||
<dimen name="tabs_counter_size">22sp</dimen>
|
||||
|
||||
@ -12,6 +12,7 @@
|
||||
<style name="GeckoBase" parent="@android:style/Theme.Light">
|
||||
<item name="android:windowNoTitle">true</item>
|
||||
<item name="android:windowContentOverlay">@null</item>
|
||||
<item name="doorhangerWidth">fill_parent</item>
|
||||
</style>
|
||||
|
||||
<style name="GeckoDialogBase" parent="@android:style/Theme.Dialog">
|
||||
|
||||
Loading…
Reference in New Issue
Block a user