diff options
| author | 2010-10-25 17:44:35 -0700 | |
|---|---|---|
| committer | 2010-10-25 17:44:35 -0700 | |
| commit | c841ef04eba47f95186e00ce69f7641f695e525b (patch) | |
| tree | bddf55b3b766086cddc1a361fa39d4ae9e395b05 | |
| parent | 7c7ff8c84f00a1c42380808141bad0f34d81cf64 (diff) | |
| parent | 5d2b178f5c7c2dc68f8a640689abb6745ba35983 (diff) | |
Merge "Holo: vertical dividers, group button states, default window backgrounds."
29 files changed, 133 insertions, 23 deletions
diff --git a/core/res/res/drawable-hdpi/btn_group_disabled_holo_dark.9.png b/core/res/res/drawable-hdpi/btn_group_disabled_holo_dark.9.png Binary files differnew file mode 100644 index 000000000000..bd353ae5cd70 --- /dev/null +++ b/core/res/res/drawable-hdpi/btn_group_disabled_holo_dark.9.png diff --git a/core/res/res/drawable-hdpi/btn_group_disabled_holo_light.9.png b/core/res/res/drawable-hdpi/btn_group_disabled_holo_light.9.png Binary files differnew file mode 100644 index 000000000000..d127b3c863e2 --- /dev/null +++ b/core/res/res/drawable-hdpi/btn_group_disabled_holo_light.9.png diff --git a/core/res/res/drawable-hdpi/btn_group_focused_holo_dark.9.png b/core/res/res/drawable-hdpi/btn_group_focused_holo_dark.9.png Binary files differnew file mode 100644 index 000000000000..1d1a58909cbd --- /dev/null +++ b/core/res/res/drawable-hdpi/btn_group_focused_holo_dark.9.png diff --git a/core/res/res/drawable-hdpi/btn_group_focused_holo_light.9.png b/core/res/res/drawable-hdpi/btn_group_focused_holo_light.9.png Binary files differnew file mode 100644 index 000000000000..1d1a58909cbd --- /dev/null +++ b/core/res/res/drawable-hdpi/btn_group_focused_holo_light.9.png diff --git a/core/res/res/drawable-hdpi/btn_group_pressed_holo_dark.9.png b/core/res/res/drawable-hdpi/btn_group_pressed_holo_dark.9.png Binary files differnew file mode 100644 index 000000000000..8922fa4711d9 --- /dev/null +++ b/core/res/res/drawable-hdpi/btn_group_pressed_holo_dark.9.png diff --git a/core/res/res/drawable-hdpi/btn_group_pressed_holo_light.9.png b/core/res/res/drawable-hdpi/btn_group_pressed_holo_light.9.png Binary files differnew file mode 100644 index 000000000000..53cf2f386f82 --- /dev/null +++ b/core/res/res/drawable-hdpi/btn_group_pressed_holo_light.9.png diff --git a/core/res/res/drawable-hdpi/divider_vertical_holo_dark.9.png b/core/res/res/drawable-hdpi/divider_vertical_holo_dark.9.png Binary files differindex deacb7303816..c039428b70b4 100644 --- a/core/res/res/drawable-hdpi/divider_vertical_holo_dark.9.png +++ b/core/res/res/drawable-hdpi/divider_vertical_holo_dark.9.png diff --git a/core/res/res/drawable-hdpi/divider_vertical_holo_light.9.png b/core/res/res/drawable-hdpi/divider_vertical_holo_light.9.png Binary files differindex cd2c826874bc..7c4a29ff25c2 100644 --- a/core/res/res/drawable-hdpi/divider_vertical_holo_light.9.png +++ b/core/res/res/drawable-hdpi/divider_vertical_holo_light.9.png diff --git a/core/res/res/drawable-mdpi/btn_group_disabled_holo_dark.9.png b/core/res/res/drawable-mdpi/btn_group_disabled_holo_dark.9.png Binary files differnew file mode 100644 index 000000000000..aa04cc962259 --- /dev/null +++ b/core/res/res/drawable-mdpi/btn_group_disabled_holo_dark.9.png diff --git a/core/res/res/drawable-mdpi/btn_group_disabled_holo_light.9.png b/core/res/res/drawable-mdpi/btn_group_disabled_holo_light.9.png Binary files differnew file mode 100644 index 000000000000..25aefd2a282c --- /dev/null +++ b/core/res/res/drawable-mdpi/btn_group_disabled_holo_light.9.png diff --git a/core/res/res/drawable-mdpi/btn_group_focused_holo_dark.9.png b/core/res/res/drawable-mdpi/btn_group_focused_holo_dark.9.png Binary files differnew file mode 100644 index 000000000000..b77cc78d3e34 --- /dev/null +++ b/core/res/res/drawable-mdpi/btn_group_focused_holo_dark.9.png diff --git a/core/res/res/drawable-mdpi/btn_group_focused_holo_light.9.png b/core/res/res/drawable-mdpi/btn_group_focused_holo_light.9.png Binary files differnew file mode 100644 index 000000000000..aa00c75544ba --- /dev/null +++ b/core/res/res/drawable-mdpi/btn_group_focused_holo_light.9.png diff --git a/core/res/res/drawable-mdpi/btn_group_pressed_holo_dark.9.png b/core/res/res/drawable-mdpi/btn_group_pressed_holo_dark.9.png Binary files differnew file mode 100644 index 000000000000..e35333b61bad --- /dev/null +++ b/core/res/res/drawable-mdpi/btn_group_pressed_holo_dark.9.png diff --git a/core/res/res/drawable-mdpi/btn_group_pressed_holo_light.9.png b/core/res/res/drawable-mdpi/btn_group_pressed_holo_light.9.png Binary files differnew file mode 100644 index 000000000000..878fddaec00b --- /dev/null +++ b/core/res/res/drawable-mdpi/btn_group_pressed_holo_light.9.png diff --git a/core/res/res/drawable-mdpi/divider_vertical_holo_dark.9.png b/core/res/res/drawable-mdpi/divider_vertical_holo_dark.9.png Binary files differindex 4c6968cb9a9d..c039428b70b4 100644 --- a/core/res/res/drawable-mdpi/divider_vertical_holo_dark.9.png +++ b/core/res/res/drawable-mdpi/divider_vertical_holo_dark.9.png diff --git a/core/res/res/drawable-mdpi/divider_vertical_holo_light.9.png b/core/res/res/drawable-mdpi/divider_vertical_holo_light.9.png Binary files differindex 7ddf1b63e2fa..7c4a29ff25c2 100644 --- a/core/res/res/drawable-mdpi/divider_vertical_holo_light.9.png +++ b/core/res/res/drawable-mdpi/divider_vertical_holo_light.9.png diff --git a/core/res/res/drawable-nodpi/background_holo_dark.png b/core/res/res/drawable-nodpi/background_holo_dark.png Binary files differnew file mode 100644 index 000000000000..f2ff75a54c9d --- /dev/null +++ b/core/res/res/drawable-nodpi/background_holo_dark.png diff --git a/core/res/res/drawable-nodpi/background_holo_light.png b/core/res/res/drawable-nodpi/background_holo_light.png Binary files differnew file mode 100644 index 000000000000..04f52aeb3456 --- /dev/null +++ b/core/res/res/drawable-nodpi/background_holo_light.png diff --git a/core/res/res/drawable/group_button_background_holo_dark.xml b/core/res/res/drawable/group_button_background_holo_dark.xml index 8e6675a0f5c4..fa007851fe1e 100644 --- a/core/res/res/drawable/group_button_background_holo_dark.xml +++ b/core/res/res/drawable/group_button_background_holo_dark.xml @@ -19,10 +19,10 @@ <item android:state_window_focused="false" android:drawable="@color/transparent" /> <!-- Even though these two point to the same resource, have two states so the drawable will invalidate itself when coming out of pressed state. --> - <item android:state_focused="true" android:state_enabled="false" android:state_pressed="true" android:drawable="@color/group_button_background_pressed_holo_dark" /> - <item android:state_focused="true" android:state_enabled="false" android:drawable="@color/group_button_background_focused_holo_dark" /> - <item android:state_focused="true" android:state_pressed="true" android:drawable="@color/group_button_background_pressed_holo_dark" /> - <item android:state_focused="false" android:state_pressed="true" android:drawable="@color/group_button_background_pressed_holo_dark" /> - <item android:state_focused="true" android:drawable="@color/group_button_background_focused_holo_dark" /> + <item android:state_focused="true" android:state_enabled="false" android:state_pressed="true" android:drawable="@drawable/btn_group_disabled_holo_dark" /> + <item android:state_focused="true" android:state_enabled="false" android:drawable="@drawable/btn_group_disabled_holo_dark" /> + <item android:state_focused="true" android:state_pressed="true" android:drawable="@drawable/btn_group_pressed_holo_dark" /> + <item android:state_focused="false" android:state_pressed="true" android:drawable="@drawable/btn_group_pressed_holo_dark" /> + <item android:state_focused="true" android:drawable="@drawable/btn_group_focused_holo_dark" /> <item android:drawable="@color/transparent" /> </selector> diff --git a/core/res/res/drawable/group_button_background_holo_light.xml b/core/res/res/drawable/group_button_background_holo_light.xml index 94b3b5a4b2a0..1e74ec78c2b4 100644 --- a/core/res/res/drawable/group_button_background_holo_light.xml +++ b/core/res/res/drawable/group_button_background_holo_light.xml @@ -19,10 +19,10 @@ <item android:state_window_focused="false" android:drawable="@color/transparent" /> <!-- Even though these two point to the same resource, have two states so the drawable will invalidate itself when coming out of pressed state. --> - <item android:state_focused="true" android:state_enabled="false" android:state_pressed="true" android:drawable="@color/group_button_background_pressed_holo_light" /> - <item android:state_focused="true" android:state_enabled="false" android:drawable="@color/group_button_background_focused_holo_light" /> - <item android:state_focused="true" android:state_pressed="true" android:drawable="@color/group_button_background_pressed_holo_light" /> - <item android:state_focused="false" android:state_pressed="true" android:drawable="@color/group_button_background_pressed_holo_light" /> - <item android:state_focused="true" android:drawable="@color/group_button_background_focused_holo_light" /> + <item android:state_focused="true" android:state_enabled="false" android:state_pressed="true" android:drawable="@drawable/btn_group_disabled_holo_light" /> + <item android:state_focused="true" android:state_enabled="false" android:drawable="@drawable/btn_group_disabled_holo_light" /> + <item android:state_focused="true" android:state_pressed="true" android:drawable="@drawable/btn_group_pressed_holo_light" /> + <item android:state_focused="false" android:state_pressed="true" android:drawable="@drawable/btn_group_pressed_holo_light" /> + <item android:state_focused="true" android:drawable="@drawable/btn_group_focused_holo_light" /> <item android:drawable="@color/transparent" /> </selector> diff --git a/core/res/res/drawable/item_background.xml b/core/res/res/drawable/item_background.xml new file mode 100644 index 000000000000..a1c9ff872aa7 --- /dev/null +++ b/core/res/res/drawable/item_background.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2010 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + + <item android:state_window_focused="false" android:drawable="@color/transparent" /> + + <!-- Even though these two point to the same resource, have two states so the drawable will invalidate itself when coming out of pressed state. --> + <item android:state_focused="true" android:state_enabled="false" android:state_pressed="true" android:drawable="@drawable/list_selector_background_disabled" /> + <item android:state_focused="true" android:state_enabled="false" android:drawable="@drawable/list_selector_background_disabled" /> + <item android:state_focused="true" android:state_pressed="true" android:drawable="@drawable/list_selector_background_transition" /> + <item android:state_focused="false" android:state_pressed="true" android:drawable="@drawable/list_selector_background_transition" /> + <item android:state_focused="true" android:drawable="@drawable/list_selector_background_focused" /> + <item android:drawable="@color/transparent" /> + +</selector> diff --git a/core/res/res/drawable/item_background_holo_dark.xml b/core/res/res/drawable/item_background_holo_dark.xml new file mode 100644 index 000000000000..f119ec02b41f --- /dev/null +++ b/core/res/res/drawable/item_background_holo_dark.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2010 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + + <item android:state_window_focused="false" android:drawable="@color/transparent" /> + + <!-- Even though these two point to the same resource, have two states so the drawable will invalidate itself when coming out of pressed state. --> + <item android:state_focused="true" android:state_enabled="false" android:state_pressed="true" android:drawable="@drawable/list_selector_disabled_holo_dark" /> + <item android:state_focused="true" android:state_enabled="false" android:drawable="@drawable/list_selector_disabled_holo_dark" /> + <item android:state_focused="true" android:state_pressed="true" android:drawable="@drawable/list_selector_background_transition_holo_dark" /> + <item android:state_focused="false" android:state_pressed="true" android:drawable="@drawable/list_selector_background_transition_holo_dark" /> + <item android:state_focused="true" android:drawable="@drawable/list_focused_holo" /> + <item android:drawable="@color/transparent" /> +</selector> diff --git a/core/res/res/drawable/item_background_holo_light.xml b/core/res/res/drawable/item_background_holo_light.xml new file mode 100644 index 000000000000..d3d278a11101 --- /dev/null +++ b/core/res/res/drawable/item_background_holo_light.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2010 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + + <item android:state_window_focused="false" android:drawable="@color/transparent" /> + + <!-- Even though these two point to the same resource, have two states so the drawable will invalidate itself when coming out of pressed state. --> + <item android:state_focused="true" android:state_enabled="false" android:state_pressed="true" android:drawable="@drawable/list_selector_disabled_holo_light" /> + <item android:state_focused="true" android:state_enabled="false" android:drawable="@drawable/list_selector_disabled_holo_light" /> + <item android:state_focused="true" android:state_pressed="true" android:drawable="@drawable/list_selector_background_transition_holo_light" /> + <item android:state_focused="false" android:state_pressed="true" android:drawable="@drawable/list_selector_background_transition_holo_light" /> + <item android:state_focused="true" android:drawable="@drawable/list_focused_holo" /> + <item android:drawable="@color/transparent" /> +</selector> diff --git a/core/res/res/layout/action_menu_item_layout.xml b/core/res/res/layout/action_menu_item_layout.xml index 1f3117ba92a7..94fcc2ff93fc 100644 --- a/core/res/res/layout/action_menu_item_layout.xml +++ b/core/res/res/layout/action_menu_item_layout.xml @@ -18,6 +18,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" + android:addStatesFromChildren="true" + android:background="?attr/selectableItemBackground" android:minWidth="64dip" android:minHeight="?attr/actionBarSize" android:paddingLeft="12dip" @@ -33,9 +35,9 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:visibility="gone" - android:background="?attr/groupButtonBackground" android:textAppearance="?attr/textAppearanceMedium" style="?attr/buttonStyleSmall" + android:background="@null" android:paddingLeft="4dip" android:paddingRight="4dip" /> </com.android.internal.view.menu.ActionMenuItemView> diff --git a/core/res/res/layout/action_mode_close_item.xml b/core/res/res/layout/action_mode_close_item.xml index 0505f18087a2..bc6989075ff8 100644 --- a/core/res/res/layout/action_mode_close_item.xml +++ b/core/res/res/layout/action_mode_close_item.xml @@ -20,7 +20,8 @@ android:layout_marginTop="12dip" android:layout_marginBottom="12dip" android:gravity="center" - android:showDividers="end"> + android:showDividers="end" + android:background="?android:attr/selectableItemBackground"> <Button android:id="@+id/action_mode_close_button" android:text="@string/action_mode_done" android:paddingLeft="16dip" diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 3f4635a569d7..d5f1610a23ac 100755 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -571,6 +571,9 @@ <!-- Drawable for group button backgrounds --> <attr name="groupButtonBackground" format="reference" /> + <!-- Background drawable for standalone items that need focus/pressed states. --> + <attr name="selectableItemBackground" format="reference" /> + <!-- SearchView dropdown background --> <attr name="searchDropdownBackground" format="reference" /> </declare-styleable> diff --git a/core/res/res/values/colors.xml b/core/res/res/values/colors.xml index 774c02d3ea2a..21b810e35a83 100644 --- a/core/res/res/values/colors.xml +++ b/core/res/res/values/colors.xml @@ -132,10 +132,10 @@ <color name="link_text_holo_light">#0000ee</color> <!-- Group buttons --> - <color name="group_button_background_pressed_holo_dark">#46c5c1ff</color> - <color name="group_button_background_focused_holo_dark">#2699cc00</color> + <color name="group_button_dialog_pressed_holo_dark">#46c5c1ff</color> + <color name="group_button_dialog_focused_holo_dark">#2699cc00</color> - <color name="group_button_background_pressed_holo_light">#ffffffff</color> - <color name="group_button_background_focused_holo_light">#4699cc00</color> + <color name="group_button_dialog_pressed_holo_light">#ffffffff</color> + <color name="group_button_dialog_focused_holo_light">#4699cc00</color> </resources> diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml index 781dd2cb1872..c441f5a193af 100644 --- a/core/res/res/values/styles.xml +++ b/core/res/res/values/styles.xml @@ -1250,15 +1250,19 @@ <item name="android:minHeight">48dip</item> <item name="android:paddingLeft">32dip</item> <item name="android:paddingRight">32dip</item> + <item name="android:paddingTop">4dip</item> + <item name="android:paddingBottom">4dip</item> </style> <style name="Widget.Holo.Button.Small"> <item name="android:background">@android:drawable/btn_default_holo_dark</item> <item name="android:textAppearance">?android:attr/textAppearanceSmall</item> <item name="android:textColor">@android:color/primary_text_holo_dark</item> - <item name="android:minHeight">40dip</item> + <item name="android:minHeight">48dip</item> <item name="android:paddingLeft">24dip</item> <item name="android:paddingRight">24dip</item> + <item name="android:paddingTop">4dip</item> + <item name="android:paddingBottom">4dip</item> </style> <style name="Widget.Holo.Button.Inset"> @@ -1279,6 +1283,7 @@ <style name="Widget.Holo.ButtonGroup" parent="Widget.ButtonGroup"> <item name="divider">?android:attr/dividerVertical</item> <item name="showDividers">middle</item> + <item name="android:background">@android:drawable/btn_default_holo_dark</item> </style> <style name="Widget.Holo.ButtonGroup.AlertDialog"> @@ -1483,6 +1488,7 @@ <style name="Widget.Holo.ActionButton.Overflow"> <item name="android:src">@android:drawable/ic_menu_moreoverflow_holo_dark</item> + <item name="android:background">?android:attr/selectableItemBackground</item> </style> <style name="Widget.Holo.ActionButton.TextButton" parent="Widget.Holo.ButtonBar.Button"> @@ -1529,14 +1535,18 @@ <item name="android:minHeight">48dip</item> <item name="android:paddingLeft">32dip</item> <item name="android:paddingRight">32dip</item> + <item name="android:paddingTop">4dip</item> + <item name="android:paddingBottom">4dip</item> </style> <style name="Widget.Holo.Light.Button.Small"> <item name="android:textAppearance">?android:attr/textAppearanceSmall</item> <item name="android:textColor">@android:color/primary_text_holo_light</item> - <item name="android:minHeight">40dip</item> + <item name="android:minHeight">48dip</item> <item name="android:paddingLeft">24dip</item> <item name="android:paddingRight">24dip</item> + <item name="android:paddingTop">4dip</item> + <item name="android:paddingBottom">4dip</item> </style> <style name="Widget.Holo.Light.Button.Inset"> @@ -1554,6 +1564,7 @@ </style> <style name="Widget.Holo.Light.ButtonGroup" parent="Widget.Holo.ButtonGroup"> + <item name="android:background">@android:drawable/btn_default_holo_light</item> </style> <style name="Widget.Holo.Light.ButtonGroup.AlertDialog"> @@ -1737,6 +1748,7 @@ <style name="Widget.Holo.Light.ActionButton.Overflow"> <item name="android:src">@android:drawable/ic_menu_moreoverflow_holo_light</item> + <item name="android:background">?android:attr/selectableItemBackground</item> </style> <style name="Widget.Holo.Light.ActionBarView_TabView" parent="Widget.ActionBarView_TabView"> diff --git a/core/res/res/values/themes.xml b/core/res/res/values/themes.xml index 7f6da2a14246..552e7e5ba01b 100644 --- a/core/res/res/values/themes.xml +++ b/core/res/res/values/themes.xml @@ -90,6 +90,7 @@ <item name="buttonStyleToggle">@android:style/Widget.Button.Toggle</item> <item name="groupButtonBackground">@null</item> + <item name="selectableItemBackground">@android:drawable/item_background</item> <!-- List attributes --> <item name="listPreferredItemHeight">64dip</item> @@ -569,7 +570,7 @@ <style name="Theme.IconMenu"> <!-- Menu/item attributes --> <item name="android:itemTextAppearance">@android:style/TextAppearance.Widget.IconMenu.Item</item> - <item name="android:itemBackground">@android:drawable/menu_selector</item> + <item name="android:selectableItemBackground">@android:drawable/menu_selector</item> <item name="android:itemIconDisabledAlpha">?android:attr/disabledAlpha</item> <item name="android:horizontalDivider">@android:drawable/divider_horizontal_dark</item> <item name="android:verticalDivider">@android:drawable/divider_vertical_dark</item> @@ -638,7 +639,7 @@ <item name="colorForeground">@android:color/bright_foreground_holo_dark</item> <item name="colorForegroundInverse">@android:color/bright_foreground_inverse_holo_dark</item> <item name="colorBackground">@android:color/background_holo_dark</item> - <item name="colorBackgroundCacheHint">?android:attr/colorBackground</item> + <item name="colorBackgroundCacheHint">@android:color/transparent</item> <item name="disabledAlpha">0.5</item> <item name="backgroundDimAmount">0.6</item> @@ -698,6 +699,7 @@ <item name="buttonStyleToggle">@android:style/Widget.Holo.Button.Toggle</item> <item name="groupButtonBackground">@android:drawable/group_button_background_holo_dark</item> + <item name="selectableItemBackground">@android:drawable/item_background_holo_dark</item> <!-- List attributes --> <item name="listPreferredItemHeight">64dip</item> @@ -730,7 +732,7 @@ <item name="galleryItemBackground">@android:drawable/gallery_item_background</item> <!-- Window attributes --> - <item name="windowBackground">@android:drawable/screen_background_holo_dark</item> + <item name="windowBackground">@android:drawable/background_holo_dark</item> <item name="windowFrame">@null</item> <item name="windowNoTitle">false</item> <item name="windowFullscreen">false</item> @@ -871,7 +873,7 @@ <item name="colorForeground">@android:color/bright_foreground_holo_light</item> <item name="colorForegroundInverse">@android:color/bright_foreground_inverse_holo_light</item> <item name="colorBackground">@android:color/background_holo_light</item> - <item name="colorBackgroundCacheHint">?android:attr/colorBackground</item> + <item name="colorBackgroundCacheHint">@android:color/transparent</item> <item name="disabledAlpha">0.5</item> <item name="backgroundDimAmount">0.6</item> @@ -931,6 +933,7 @@ <item name="buttonStyleToggle">@android:style/Widget.Holo.Light.Button.Toggle</item> <item name="groupButtonBackground">@android:drawable/group_button_background_holo_light</item> + <item name="selectableItemBackground">@android:drawable/item_background_holo_light</item> <!-- List attributes --> <item name="listPreferredItemHeight">64dip</item> @@ -963,7 +966,7 @@ <item name="galleryItemBackground">@android:drawable/gallery_item_background</item> <!-- Window attributes --> - <item name="windowBackground">@android:drawable/screen_background_holo_light</item> + <item name="windowBackground">@android:drawable/background_holo_light</item> <item name="windowFrame">@null</item> <item name="windowNoTitle">false</item> <item name="windowFullscreen">false</item> @@ -1146,6 +1149,8 @@ <item name="android:windowActionModeOverlay">true</item> <item name="android:colorBackgroundCacheHint">@null</item> + + <item name="android:groupButtonBackground">?android:attr/selectableItemBackground</item> <item name="textAppearance">@android:style/TextAppearance.Holo</item> <item name="textAppearanceInverse">@android:style/TextAppearance.Holo.Inverse</item> @@ -1196,6 +1201,8 @@ <item name="android:colorBackgroundCacheHint">@null</item> + <item name="android:groupButtonBackground">?android:attr/selectableItemBackground</item> + <item name="textAppearance">@android:style/TextAppearance.Holo.Light</item> <item name="textAppearanceInverse">@android:style/TextAppearance.Holo.Light.Inverse</item> </style> |
