зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1148550 - Update GeckoMenu pressed color. r=mhaigh
This also involved moving a redundant background declaration to only the containing style. --HG-- rename : mobile/android/base/resources/drawable/action_bar_button.xml => mobile/android/base/resources/drawable/menu_item_action_bar_bg.xml extra : commitid : GFUgNsiZgGb extra : rebase_source : 4a3c03b50f923e50bf99effea9b9d34813adb40b
This commit is contained in:
Родитель
cb9ea0a54e
Коммит
459808a15f
|
@ -0,0 +1,24 @@
|
|||
<?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/. -->
|
||||
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<item android:state_pressed="true"
|
||||
android:state_enabled="true">
|
||||
<shape>
|
||||
<solid android:color="@color/toolbar_grey_pressed" />
|
||||
</shape>
|
||||
</item>
|
||||
|
||||
<item android:state_focused="true"
|
||||
android:state_pressed="false">
|
||||
<shape>
|
||||
<solid android:color="@color/highlight_focused" />
|
||||
</shape>
|
||||
</item>
|
||||
|
||||
<item android:drawable="@android:color/transparent"/>
|
||||
|
||||
</selector>
|
|
@ -15,7 +15,7 @@
|
|||
android:id="@+id/menu_item"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="@drawable/action_bar_button"
|
||||
android:background="@drawable/menu_item_action_bar_bg"
|
||||
android:clickable="true"
|
||||
android:focusable="true"/>
|
||||
|
||||
|
@ -24,7 +24,6 @@
|
|||
android:id="@+id/menu_item_button"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="@drawable/action_bar_button"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:visibility="gone"/>
|
||||
|
||||
|
|
|
@ -81,19 +81,20 @@
|
|||
</style>
|
||||
|
||||
<style name="Widget.GeckoMenuListView" parent="Widget.ListView">
|
||||
<item name="android:listSelector">@drawable/menu_item_action_bar_bg</item>
|
||||
<item name="android:divider">@color/divider_light</item>
|
||||
</style>
|
||||
|
||||
<style name="Widget.MenuItemActionBar">
|
||||
<item name="android:padding">8dip</item>
|
||||
<item name="android:background">@drawable/action_bar_button</item>
|
||||
<item name="android:background">@drawable/menu_item_action_bar_bg</item>
|
||||
<item name="android:scaleType">fitCenter</item>
|
||||
<item name="drawableTintList">@color/action_bar_menu_item_colors</item>"
|
||||
</style>
|
||||
|
||||
<style name="Widget.MenuItemSecondaryActionBar">
|
||||
<item name="android:padding">8dip</item>
|
||||
<item name="android:background">@drawable/action_bar_button</item>
|
||||
<item name="android:background">@drawable/menu_item_action_bar_bg</item>
|
||||
<item name="android:scaleType">centerInside</item>
|
||||
<item name="drawableTintList">@color/action_bar_secondary_menu_item_colors</item>
|
||||
</style>
|
||||
|
|
Загрузка…
Ссылка в новой задаче