зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1138723 - Move arrowPopupWidth to dimens (from theme attr). r=liuche
This required the creation of custom_match_parent and custom_wrap_content dimens (via http://stackoverflow.com/a/19043952). --HG-- extra : rebase_source : 2077e5a87fc66a99d99c7b28038ddf7474e9837f
This commit is contained in:
Родитель
c001f8d670
Коммит
f24a4076b4
|
@ -8,7 +8,7 @@
|
|||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<ScrollView android:layout_width="?attr/arrowPopupWidth"
|
||||
<ScrollView android:layout_width="@dimen/arrow_popup_container_width"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentTop="true"
|
||||
android:background="@drawable/arrow_popup_bg">
|
||||
|
|
|
@ -5,6 +5,8 @@
|
|||
|
||||
<resources>
|
||||
|
||||
<dimen name="arrow_popup_container_width">400dp</dimen>
|
||||
|
||||
<dimen name="browser_toolbar_height">56dp</dimen>
|
||||
<dimen name="browser_toolbar_button_padding">16dp</dimen>
|
||||
<dimen name="browser_toolbar_favicon_size">16dp</dimen>
|
||||
|
|
|
@ -13,7 +13,6 @@
|
|||
<item name="android:windowContentOverlay">@null</item>
|
||||
<item name="android:windowActionBar">false</item>
|
||||
<item name="android:windowNoTitle">true</item>
|
||||
<item name="arrowPopupWidth">400dp</item>
|
||||
</style>
|
||||
|
||||
<style name="GeckoStartPane" parent="Gecko.Dialog"/>
|
||||
|
|
|
@ -13,7 +13,6 @@
|
|||
<item name="android:windowContentOverlay">@null</item>
|
||||
<item name="android:windowActionBar">false</item>
|
||||
<item name="android:windowNoTitle">true</item>
|
||||
<item name="arrowPopupWidth">match_parent</item>
|
||||
</style>
|
||||
|
||||
<style name="GeckoDialogBase" parent="@android:style/Theme.Holo.Light.Dialog">
|
||||
|
|
|
@ -12,7 +12,6 @@
|
|||
<item name="android:colorPrimary">@color/primary</item>
|
||||
<item name="android:windowNoTitle">true</item>
|
||||
<item name="android:windowContentOverlay">@null</item>
|
||||
<item name="arrowPopupWidth">match_parent</item>
|
||||
</style>
|
||||
|
||||
</resources>
|
||||
|
|
|
@ -54,15 +54,6 @@
|
|||
|
||||
</declare-styleable>
|
||||
|
||||
<!-- DoorHangers -->
|
||||
<declare-styleable name="DoorHanger">
|
||||
<attr name="arrowPopupWidth" 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"/>
|
||||
|
|
|
@ -174,6 +174,7 @@
|
|||
<dimen name="arrow_popup_arrow_width">40dip</dimen>
|
||||
<dimen name="arrow_popup_arrow_height">12dip</dimen>
|
||||
<dimen name="arrow_popup_arrow_offset">8dp</dimen>
|
||||
<dimen name="arrow_popup_container_width">@dimen/custom_match_parent</dimen>
|
||||
|
||||
<!-- TabHistoryItemRow dimensions. -->
|
||||
<dimen name="tab_history_timeline_width">3dp</dimen>
|
||||
|
@ -201,4 +202,8 @@
|
|||
<dimen name="find_in_page_matchcase_padding">10dip</dimen>
|
||||
<dimen name="find_in_page_control_margin_top">2dip</dimen>
|
||||
|
||||
<!-- Use android attr in dimens, via http://stackoverflow.com/a/19043952 -->
|
||||
<dimen name="custom_match_parent">-2px</dimen>
|
||||
<dimen name="custom_wrap_content">-1px</dimen>
|
||||
|
||||
</resources>
|
||||
|
|
|
@ -12,7 +12,6 @@
|
|||
<style name="GeckoBase" parent="@android:style/Theme.Light">
|
||||
<item name="android:windowNoTitle">true</item>
|
||||
<item name="android:windowContentOverlay">@null</item>
|
||||
<item name="arrowPopupWidth">match_parent</item>
|
||||
</style>
|
||||
|
||||
<style name="GeckoDialogBase" parent="@android:style/Theme.Dialog">
|
||||
|
|
Загрузка…
Ссылка в новой задаче