Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am e262ab2f: Merge "Changed menu and expandedMenu background color to dark." into gingerbread

Browse Source 
Merge commit 'e262ab2f797eeaf9ad200a1b8479f67641c2aebb' into gingerbread-plus-aosp

* commit 'e262ab2f797eeaf9ad200a1b8479f67641c2aebb':
  Changed menu and expandedMenu background color to dark.
This commit is contained in:
Gilles Debunne
2010-09-10 14:19:50 -07:00
committed by Android Git Automerger
parent 37fc8cc7b8 e262ab2f79
commit ddea348daa
6 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/res/res/drawable-hdpi/menu_background.9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 227 B

BIN
core/res/res/drawable-hdpi/menu_background_fill_parent_width.9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 322 B

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
core/res/res/drawable-mdpi/menu_background.9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 359 B

BIN
core/res/res/drawable-mdpi/menu_background_fill_parent_width.9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 247 B

4
core/res/res/values/styles.xml
View File

@@ -506,7 +506,7 @@
<item name="android:fadingEdge">vertical</item> <item name="android:fadingEdge">vertical</item>
<item name="listSelector">@android:drawable/menu_selector</item> <item name="listSelector">@android:drawable/menu_selector</item>
<!-- Light background for the list in menus, so the divider for bright themes --> <!-- Light background for the list in menus, so the divider for bright themes -->
<item name="android:divider">@android:drawable/divider_horizontal_bright</item> <item name="android:divider">@android:drawable/divider_horizontal_dark</item>
</style> </style>
<style name="Widget.GridView" parent="Widget.AbsListView"> <style name="Widget.GridView" parent="Widget.AbsListView">
@@ -676,7 +676,7 @@
</style> </style>
<style name="TextAppearance.Widget.IconMenu.Item" parent="TextAppearance.Small"> <style name="TextAppearance.Widget.IconMenu.Item" parent="TextAppearance.Small">
<item name="android:textColor">?textColorPrimaryInverse</item> <item name="android:textColor">?textColorPrimary</item>
</style> </style>
<style name="TextAppearance.Widget.EditText"> <style name="TextAppearance.Widget.EditText">

13
core/res/res/values/themes.xml
View File

@@ -122,9 +122,10 @@
<!-- Panel attributes --> <!-- Panel attributes -->
<item name="panelBackground">@android:drawable/menu_background</item> <item name="panelBackground">@android:drawable/menu_background</item>
<item name="panelFullBackground">@android:drawable/menu_background_fill_parent_width</item> <item name="panelFullBackground">@android:drawable/menu_background_fill_parent_width</item>
<item name="panelColorBackground">#fff</item> <!-- These three attributes do not seems to be used by the framework. Declared public though -->
<item name="panelColorForeground">?android:attr/textColorPrimaryInverse</item> <item name="panelColorBackground">#000</item>
<item name="panelTextAppearance">?android:attr/textAppearanceInverse</item> <item name="panelColorForeground">?android:attr/textColorPrimary</item>
<item name="panelTextAppearance">?android:attr/textAppearance</item>
<!-- Scrollbar attributes --> <!-- Scrollbar attributes -->
<item name="scrollbarFadeDuration">250</item> <item name="scrollbarFadeDuration">250</item>
@@ -488,8 +489,8 @@
<item name="android:itemTextAppearance">@android:style/TextAppearance.Widget.IconMenu.Item</item> <item name="android:itemTextAppearance">@android:style/TextAppearance.Widget.IconMenu.Item</item>
<item name="android:itemBackground">@android:drawable/menu_selector</item> <item name="android:itemBackground">@android:drawable/menu_selector</item>
<item name="android:itemIconDisabledAlpha">?android:attr/disabledAlpha</item> <item name="android:itemIconDisabledAlpha">?android:attr/disabledAlpha</item>
<item name="android:horizontalDivider">@android:drawable/divider_horizontal_bright</item> <item name="android:horizontalDivider">@android:drawable/divider_horizontal_dark</item>
<item name="android:verticalDivider">@android:drawable/divider_vertical_bright</item> <item name="android:verticalDivider">@android:drawable/divider_vertical_dark</item>
<item name="android:windowAnimationStyle">@android:style/Animation.OptionsPanel</item> <item name="android:windowAnimationStyle">@android:style/Animation.OptionsPanel</item>
<item name="android:moreIcon">@android:drawable/ic_menu_more</item> <item name="android:moreIcon">@android:drawable/ic_menu_more</item>
<item name="android:background">@null</item> <item name="android:background">@null</item>
@@ -497,7 +498,7 @@
<style name="Theme.ExpandedMenu"> <style name="Theme.ExpandedMenu">
<!-- Menu/item attributes --> <!-- Menu/item attributes -->
<item name="android:itemTextAppearance">?android:attr/textAppearanceLargeInverse</item> <item name="android:itemTextAppearance">?android:attr/textAppearanceLarge</item>
<item name="android:listViewStyle">@android:style/Widget.ListView.Menu</item> <item name="android:listViewStyle">@android:style/Widget.ListView.Menu</item>
<item name="android:windowAnimationStyle">@android:style/Animation.OptionsPanel</item> <item name="android:windowAnimationStyle">@android:style/Animation.OptionsPanel</item>
<item name="android:background">@null</item> <item name="android:background">@null</item>