diff options
56 files changed, 121 insertions, 43 deletions
diff --git a/core/res/res/color/primary_text_holo_dark.xml b/core/res/res/color/primary_text_holo_dark.xml index 69ee30948506..641866459bcc 100644 --- a/core/res/res/color/primary_text_holo_dark.xml +++ b/core/res/res/color/primary_text_holo_dark.xml @@ -15,10 +15,10 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_enabled="false" android:color="@android:color/bright_foreground_dark_disabled"/> - <item android:state_window_focused="false" android:color="@android:color/bright_foreground_dark"/> - <item android:state_pressed="true" android:color="@android:color/bright_foreground_dark"/> - <item android:state_selected="true" android:color="@android:color/bright_foreground_dark"/> - <item android:state_activated="true" android:color="@android:color/bright_foreground_dark"/> - <item android:color="@android:color/bright_foreground_dark"/> <!-- not selected --> + <item android:state_enabled="false" android:color="@android:color/bright_foreground_disabled_holo_dark"/> + <item android:state_window_focused="false" android:color="@android:color/bright_foreground_holo_dark"/> + <item android:state_pressed="true" android:color="@android:color/bright_foreground_holo_dark"/> + <item android:state_selected="true" android:color="@android:color/bright_foreground_holo_dark"/> + <item android:state_activated="true" android:color="@android:color/bright_foreground_holo_dark"/> + <item android:color="@android:color/bright_foreground_holo_dark"/> <!-- not selected --> </selector> diff --git a/core/res/res/color/primary_text_holo_light.xml b/core/res/res/color/primary_text_holo_light.xml index a8d31cecafbf..86f8f8650518 100644 --- a/core/res/res/color/primary_text_holo_light.xml +++ b/core/res/res/color/primary_text_holo_light.xml @@ -15,12 +15,12 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_enabled="false" android:color="@android:color/bright_foreground_light_disabled"/> - <item android:state_window_focused="false" android:color="@android:color/bright_foreground_light"/> - <item android:state_pressed="true" android:color="@android:color/bright_foreground_light"/> - <item android:state_selected="true" android:color="@android:color/bright_foreground_light"/> - <item android:state_activated="true" android:color="@android:color/bright_foreground_light"/> - <item android:color="@android:color/bright_foreground_light"/> <!-- not selected --> + <item android:state_enabled="false" android:color="@android:color/bright_foreground_disabled_holo_light"/> + <item android:state_window_focused="false" android:color="@android:color/bright_foreground_holo_light"/> + <item android:state_pressed="true" android:color="@android:color/bright_foreground_holo_light"/> + <item android:state_selected="true" android:color="@android:color/bright_foreground_holo_light"/> + <item android:state_activated="true" android:color="@android:color/bright_foreground_holo_light"/> + <item android:color="@android:color/bright_foreground_holo_light"/> <!-- not selected --> </selector> diff --git a/core/res/res/color/secondary_text_holo_dark.xml b/core/res/res/color/secondary_text_holo_dark.xml index 376156e7427e..881a1de3d0c2 100644 --- a/core/res/res/color/secondary_text_holo_dark.xml +++ b/core/res/res/color/secondary_text_holo_dark.xml @@ -15,13 +15,13 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_window_focused="false" android:state_enabled="false" android:color="@android:color/dim_foreground_dark_disabled"/> - <item android:state_window_focused="false" android:color="@android:color/dim_foreground_dark"/> - <item android:state_selected="true" android:state_enabled="false" android:color="@android:color/dim_foreground_dark_inverse_disabled"/> - <item android:state_pressed="true" android:state_enabled="false" android:color="@android:color/dim_foreground_dark_inverse_disabled"/> - <item android:state_selected="true" android:color="@android:color/dim_foreground_dark_inverse"/> - <item android:state_activated="true" android:color="@android:color/bright_foreground_dark_inverse"/> - <item android:state_pressed="true" android:color="@android:color/dim_foreground_dark_inverse"/> - <item android:state_enabled="false" android:color="@android:color/dim_foreground_dark_disabled"/> - <item android:color="@android:color/dim_foreground_dark"/> <!-- not selected --> + <item android:state_window_focused="false" android:state_enabled="false" android:color="@android:color/dim_foreground_disabled_holo_dark"/> + <item android:state_window_focused="false" android:color="@android:color/dim_foreground_holo_dark"/> + <item android:state_selected="true" android:state_enabled="false" android:color="@android:color/dim_foreground_inverse_disabled_holo_dark"/> + <item android:state_pressed="true" android:state_enabled="false" android:color="@android:color/dim_foreground_inverse_disabled_holo_dark"/> + <item android:state_selected="true" android:color="@android:color/dim_foreground_inverse_holo_dark"/> + <item android:state_activated="true" android:color="@android:color/bright_foreground_inverse_holo_dark"/> + <item android:state_pressed="true" android:color="@android:color/dim_foreground_inverse_holo_dark"/> + <item android:state_enabled="false" android:color="@android:color/dim_foreground_disabled_holo_dark"/> + <item android:color="@android:color/dim_foreground_holo_dark"/> <!-- not selected --> </selector> diff --git a/core/res/res/color/secondary_text_holo_light.xml b/core/res/res/color/secondary_text_holo_light.xml index b791aebef644..05721b2f041c 100644 --- a/core/res/res/color/secondary_text_holo_light.xml +++ b/core/res/res/color/secondary_text_holo_light.xml @@ -15,14 +15,14 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_window_focused="false" android:state_enabled="false" android:color="@android:color/dim_foreground_light_disabled"/> - <item android:state_window_focused="false" android:color="@android:color/dim_foreground_light"/> + <item android:state_window_focused="false" android:state_enabled="false" android:color="@android:color/dim_foreground_disabled_holo_light"/> + <item android:state_window_focused="false" android:color="@android:color/dim_foreground_holo_light"/> <!-- Since there is only one selector (for both light and dark), the light's selected state shouldn't be inversed like the dark's. --> - <item android:state_pressed="true" android:state_enabled="false" android:color="@android:color/dim_foreground_light_disabled"/> - <item android:state_selected="true" android:state_enabled="false" android:color="@android:color/dim_foreground_light_disabled"/> - <item android:state_pressed="true" android:color="@android:color/dim_foreground_light"/> - <item android:state_selected="true" android:color="@android:color/dim_foreground_light"/> - <item android:state_activated="true" android:color="@android:color/bright_foreground_light"/> - <item android:state_enabled="false" android:color="@android:color/dim_foreground_light_disabled"/> - <item android:color="@android:color/dim_foreground_light"/> <!-- not selected --> + <item android:state_pressed="true" android:state_enabled="false" android:color="@android:color/dim_foreground_disabled_holo_light"/> + <item android:state_selected="true" android:state_enabled="false" android:color="@android:color/dim_foreground_disabled_holo_light"/> + <item android:state_pressed="true" android:color="@android:color/dim_foreground_holo_light"/> + <item android:state_selected="true" android:color="@android:color/dim_foreground_holo_light"/> + <item android:state_activated="true" android:color="@android:color/bright_foreground_holo_light"/> + <item android:state_enabled="false" android:color="@android:color/dim_foreground_disabled_holo_light"/> + <item android:color="@android:color/dim_foreground_holo_light"/> <!-- not selected --> </selector> diff --git a/core/res/res/color/tertiary_text_holo_dark.xml b/core/res/res/color/tertiary_text_holo_dark.xml index 269ff719e244..0718d7db4fef 100644 --- a/core/res/res/color/tertiary_text_holo_dark.xml +++ b/core/res/res/color/tertiary_text_holo_dark.xml @@ -18,7 +18,7 @@ <item android:state_enabled="false" android:color="#808080"/> <item android:state_window_focused="false" android:color="#808080"/> <item android:state_pressed="true" android:color="#808080"/> - <item android:state_selected="true" android:color="@android:color/dim_foreground_light"/> + <item android:state_selected="true" android:color="@android:color/dim_foreground_holo_light"/> <item android:color="#808080"/> <!-- not selected --> </selector> diff --git a/core/res/res/drawable-hdpi/btn_default_disabled_focused_holo_dark.9.png b/core/res/res/drawable-hdpi/btn_default_disabled_focused_holo_dark.9.png Binary files differindex 05d1668063a0..19ad5c902206 100644 --- a/core/res/res/drawable-hdpi/btn_default_disabled_focused_holo_dark.9.png +++ b/core/res/res/drawable-hdpi/btn_default_disabled_focused_holo_dark.9.png diff --git a/core/res/res/drawable-hdpi/btn_default_disabled_focused_holo_light.9.png b/core/res/res/drawable-hdpi/btn_default_disabled_focused_holo_light.9.png Binary files differindex 6f7eb4245d6b..180cdf51a1b7 100644 --- a/core/res/res/drawable-hdpi/btn_default_disabled_focused_holo_light.9.png +++ b/core/res/res/drawable-hdpi/btn_default_disabled_focused_holo_light.9.png diff --git a/core/res/res/drawable-hdpi/btn_default_disabled_holo_dark.9.png b/core/res/res/drawable-hdpi/btn_default_disabled_holo_dark.9.png Binary files differindex 2c814f072471..c66bb07498e8 100644 --- a/core/res/res/drawable-hdpi/btn_default_disabled_holo_dark.9.png +++ b/core/res/res/drawable-hdpi/btn_default_disabled_holo_dark.9.png diff --git a/core/res/res/drawable-hdpi/btn_default_disabled_holo_light.9.png b/core/res/res/drawable-hdpi/btn_default_disabled_holo_light.9.png Binary files differindex a88bdf6c9b20..c0d3dd758baa 100644 --- a/core/res/res/drawable-hdpi/btn_default_disabled_holo_light.9.png +++ b/core/res/res/drawable-hdpi/btn_default_disabled_holo_light.9.png diff --git a/core/res/res/drawable-hdpi/btn_default_focused_holo_dark.9.png b/core/res/res/drawable-hdpi/btn_default_focused_holo_dark.9.png Binary files differindex 9a61d822966d..b440e15ff217 100644 --- a/core/res/res/drawable-hdpi/btn_default_focused_holo_dark.9.png +++ b/core/res/res/drawable-hdpi/btn_default_focused_holo_dark.9.png diff --git a/core/res/res/drawable-hdpi/btn_default_focused_holo_light.9.png b/core/res/res/drawable-hdpi/btn_default_focused_holo_light.9.png Binary files differindex 56ca52836ce8..8769d0a31a5c 100644 --- a/core/res/res/drawable-hdpi/btn_default_focused_holo_light.9.png +++ b/core/res/res/drawable-hdpi/btn_default_focused_holo_light.9.png diff --git a/core/res/res/drawable-hdpi/btn_default_normal_holo_dark.9.png b/core/res/res/drawable-hdpi/btn_default_normal_holo_dark.9.png Binary files differindex 660003582d0d..7b8e9e8d707c 100644 --- a/core/res/res/drawable-hdpi/btn_default_normal_holo_dark.9.png +++ b/core/res/res/drawable-hdpi/btn_default_normal_holo_dark.9.png diff --git a/core/res/res/drawable-hdpi/btn_default_normal_holo_light.9.png b/core/res/res/drawable-hdpi/btn_default_normal_holo_light.9.png Binary files differindex 11d31bb579e4..37c802848408 100644 --- a/core/res/res/drawable-hdpi/btn_default_normal_holo_light.9.png +++ b/core/res/res/drawable-hdpi/btn_default_normal_holo_light.9.png diff --git a/core/res/res/drawable-hdpi/btn_default_pressed_holo_dark.9.png b/core/res/res/drawable-hdpi/btn_default_pressed_holo_dark.9.png Binary files differindex 8c58c3778859..aa08f45e3091 100644 --- a/core/res/res/drawable-hdpi/btn_default_pressed_holo_dark.9.png +++ b/core/res/res/drawable-hdpi/btn_default_pressed_holo_dark.9.png diff --git a/core/res/res/drawable-hdpi/btn_default_pressed_holo_light.9.png b/core/res/res/drawable-hdpi/btn_default_pressed_holo_light.9.png Binary files differindex d543c660c55c..3e99cb6b2752 100644 --- a/core/res/res/drawable-hdpi/btn_default_pressed_holo_light.9.png +++ b/core/res/res/drawable-hdpi/btn_default_pressed_holo_light.9.png diff --git a/core/res/res/drawable-hdpi/list_activated_holo.9.png b/core/res/res/drawable-hdpi/list_activated_holo.9.png Binary files differnew file mode 100644 index 000000000000..cd9a08e43fae --- /dev/null +++ b/core/res/res/drawable-hdpi/list_activated_holo.9.png diff --git a/core/res/res/drawable-hdpi/list_divider_holo_dark.9.png b/core/res/res/drawable-hdpi/list_divider_holo_dark.9.png Binary files differnew file mode 100644 index 000000000000..7b18202e38d6 --- /dev/null +++ b/core/res/res/drawable-hdpi/list_divider_holo_dark.9.png diff --git a/core/res/res/drawable-hdpi/list_divider_holo_light.9.png b/core/res/res/drawable-hdpi/list_divider_holo_light.9.png Binary files differnew file mode 100644 index 000000000000..17bcbb4641ba --- /dev/null +++ b/core/res/res/drawable-hdpi/list_divider_holo_light.9.png diff --git a/core/res/res/drawable-hdpi/list_focused_holo.9.png b/core/res/res/drawable-hdpi/list_focused_holo.9.png Binary files differnew file mode 100644 index 000000000000..b91e9f2f8bee --- /dev/null +++ b/core/res/res/drawable-hdpi/list_focused_holo.9.png diff --git a/core/res/res/drawable-hdpi/list_longpressed_holo.9.png b/core/res/res/drawable-hdpi/list_longpressed_holo.9.png Binary files differnew file mode 100644 index 000000000000..db4831df025c --- /dev/null +++ b/core/res/res/drawable-hdpi/list_longpressed_holo.9.png diff --git a/core/res/res/drawable-hdpi/list_pressed_holo_dark.9.png b/core/res/res/drawable-hdpi/list_pressed_holo_dark.9.png Binary files differnew file mode 100644 index 000000000000..1ce160190b98 --- /dev/null +++ b/core/res/res/drawable-hdpi/list_pressed_holo_dark.9.png diff --git a/core/res/res/drawable-hdpi/list_pressed_holo_light.9.png b/core/res/res/drawable-hdpi/list_pressed_holo_light.9.png Binary files differnew file mode 100644 index 000000000000..b36aa2cf1a8c --- /dev/null +++ b/core/res/res/drawable-hdpi/list_pressed_holo_light.9.png diff --git a/core/res/res/drawable-hdpi/list_section_divider_holo_dark.9.png b/core/res/res/drawable-hdpi/list_section_divider_holo_dark.9.png Binary files differnew file mode 100644 index 000000000000..2dabb5fd669f --- /dev/null +++ b/core/res/res/drawable-hdpi/list_section_divider_holo_dark.9.png diff --git a/core/res/res/drawable-hdpi/list_section_divider_holo_light.9.png b/core/res/res/drawable-hdpi/list_section_divider_holo_light.9.png Binary files differnew file mode 100644 index 000000000000..763f4f6f1a2b --- /dev/null +++ b/core/res/res/drawable-hdpi/list_section_divider_holo_light.9.png diff --git a/core/res/res/drawable-hdpi/list_selected_holo_dark.9.png b/core/res/res/drawable-hdpi/list_selected_holo_dark.9.png Binary files differnew file mode 100644 index 000000000000..c054e14e7085 --- /dev/null +++ b/core/res/res/drawable-hdpi/list_selected_holo_dark.9.png diff --git a/core/res/res/drawable-hdpi/list_selected_holo_light.9.png b/core/res/res/drawable-hdpi/list_selected_holo_light.9.png Binary files differnew file mode 100644 index 000000000000..77c403268506 --- /dev/null +++ b/core/res/res/drawable-hdpi/list_selected_holo_light.9.png diff --git a/core/res/res/drawable-mdpi/btn_default_disabled_focused_holo_dark.9.png b/core/res/res/drawable-mdpi/btn_default_disabled_focused_holo_dark.9.png Binary files differindex 15003be6af91..ca2271acd5fb 100644 --- a/core/res/res/drawable-mdpi/btn_default_disabled_focused_holo_dark.9.png +++ b/core/res/res/drawable-mdpi/btn_default_disabled_focused_holo_dark.9.png diff --git a/core/res/res/drawable-mdpi/btn_default_disabled_focused_holo_light.9.png b/core/res/res/drawable-mdpi/btn_default_disabled_focused_holo_light.9.png Binary files differindex 573f197846b6..0d498e328f48 100644 --- a/core/res/res/drawable-mdpi/btn_default_disabled_focused_holo_light.9.png +++ b/core/res/res/drawable-mdpi/btn_default_disabled_focused_holo_light.9.png diff --git a/core/res/res/drawable-mdpi/btn_default_disabled_holo_dark.9.png b/core/res/res/drawable-mdpi/btn_default_disabled_holo_dark.9.png Binary files differindex 953a553263f0..ae922ce71a8c 100644 --- a/core/res/res/drawable-mdpi/btn_default_disabled_holo_dark.9.png +++ b/core/res/res/drawable-mdpi/btn_default_disabled_holo_dark.9.png diff --git a/core/res/res/drawable-mdpi/btn_default_disabled_holo_light.9.png b/core/res/res/drawable-mdpi/btn_default_disabled_holo_light.9.png Binary files differindex d79a61e88018..89aef315362f 100644 --- a/core/res/res/drawable-mdpi/btn_default_disabled_holo_light.9.png +++ b/core/res/res/drawable-mdpi/btn_default_disabled_holo_light.9.png diff --git a/core/res/res/drawable-mdpi/btn_default_focused_holo_dark.9.png b/core/res/res/drawable-mdpi/btn_default_focused_holo_dark.9.png Binary files differindex 897676ee2425..1f4be446763a 100644 --- a/core/res/res/drawable-mdpi/btn_default_focused_holo_dark.9.png +++ b/core/res/res/drawable-mdpi/btn_default_focused_holo_dark.9.png diff --git a/core/res/res/drawable-mdpi/btn_default_focused_holo_light.9.png b/core/res/res/drawable-mdpi/btn_default_focused_holo_light.9.png Binary files differindex b48592549f05..e4d0ba047f8f 100644 --- a/core/res/res/drawable-mdpi/btn_default_focused_holo_light.9.png +++ b/core/res/res/drawable-mdpi/btn_default_focused_holo_light.9.png diff --git a/core/res/res/drawable-mdpi/btn_default_normal_holo_dark.9.png b/core/res/res/drawable-mdpi/btn_default_normal_holo_dark.9.png Binary files differindex 1cdbf6602a71..050fb193c6c8 100644 --- a/core/res/res/drawable-mdpi/btn_default_normal_holo_dark.9.png +++ b/core/res/res/drawable-mdpi/btn_default_normal_holo_dark.9.png diff --git a/core/res/res/drawable-mdpi/btn_default_normal_holo_light.9.png b/core/res/res/drawable-mdpi/btn_default_normal_holo_light.9.png Binary files differindex ab7eb5445bec..75651fc7ba70 100644 --- a/core/res/res/drawable-mdpi/btn_default_normal_holo_light.9.png +++ b/core/res/res/drawable-mdpi/btn_default_normal_holo_light.9.png diff --git a/core/res/res/drawable-mdpi/btn_default_pressed_holo_dark.9.png b/core/res/res/drawable-mdpi/btn_default_pressed_holo_dark.9.png Binary files differindex d95ef6dc28a6..c7d02cfc7d80 100644 --- a/core/res/res/drawable-mdpi/btn_default_pressed_holo_dark.9.png +++ b/core/res/res/drawable-mdpi/btn_default_pressed_holo_dark.9.png diff --git a/core/res/res/drawable-mdpi/btn_default_pressed_holo_light.9.png b/core/res/res/drawable-mdpi/btn_default_pressed_holo_light.9.png Binary files differindex 60ed4fc72c4a..40c9f6411ffd 100644 --- a/core/res/res/drawable-mdpi/btn_default_pressed_holo_light.9.png +++ b/core/res/res/drawable-mdpi/btn_default_pressed_holo_light.9.png diff --git a/core/res/res/drawable-mdpi/list_activated_holo.9.png b/core/res/res/drawable-mdpi/list_activated_holo.9.png Binary files differnew file mode 100644 index 000000000000..01ec67477db2 --- /dev/null +++ b/core/res/res/drawable-mdpi/list_activated_holo.9.png diff --git a/core/res/res/drawable-mdpi/list_divider_holo_dark.9.png b/core/res/res/drawable-mdpi/list_divider_holo_dark.9.png Binary files differnew file mode 100644 index 000000000000..7b18202e38d6 --- /dev/null +++ b/core/res/res/drawable-mdpi/list_divider_holo_dark.9.png diff --git a/core/res/res/drawable-mdpi/list_divider_holo_light.9.png b/core/res/res/drawable-mdpi/list_divider_holo_light.9.png Binary files differnew file mode 100644 index 000000000000..17bcbb4641ba --- /dev/null +++ b/core/res/res/drawable-mdpi/list_divider_holo_light.9.png diff --git a/core/res/res/drawable-mdpi/list_focused_holo.9.png b/core/res/res/drawable-mdpi/list_focused_holo.9.png Binary files differnew file mode 100644 index 000000000000..23385df95aee --- /dev/null +++ b/core/res/res/drawable-mdpi/list_focused_holo.9.png diff --git a/core/res/res/drawable-mdpi/list_longpressed_holo.9.png b/core/res/res/drawable-mdpi/list_longpressed_holo.9.png Binary files differnew file mode 100644 index 000000000000..3312a51fea70 --- /dev/null +++ b/core/res/res/drawable-mdpi/list_longpressed_holo.9.png diff --git a/core/res/res/drawable-mdpi/list_pressed_holo_dark.9.png b/core/res/res/drawable-mdpi/list_pressed_holo_dark.9.png Binary files differnew file mode 100644 index 000000000000..bbb14d86386b --- /dev/null +++ b/core/res/res/drawable-mdpi/list_pressed_holo_dark.9.png diff --git a/core/res/res/drawable-mdpi/list_pressed_holo_light.9.png b/core/res/res/drawable-mdpi/list_pressed_holo_light.9.png Binary files differnew file mode 100644 index 000000000000..72380d4f83e7 --- /dev/null +++ b/core/res/res/drawable-mdpi/list_pressed_holo_light.9.png diff --git a/core/res/res/drawable-mdpi/list_section_divider_holo_dark.9.png b/core/res/res/drawable-mdpi/list_section_divider_holo_dark.9.png Binary files differnew file mode 100644 index 000000000000..953d7bf367b5 --- /dev/null +++ b/core/res/res/drawable-mdpi/list_section_divider_holo_dark.9.png diff --git a/core/res/res/drawable-mdpi/list_section_divider_holo_light.9.png b/core/res/res/drawable-mdpi/list_section_divider_holo_light.9.png Binary files differnew file mode 100644 index 000000000000..e5fe664ecac1 --- /dev/null +++ b/core/res/res/drawable-mdpi/list_section_divider_holo_light.9.png diff --git a/core/res/res/drawable-mdpi/list_selected_holo_dark.9.png b/core/res/res/drawable-mdpi/list_selected_holo_dark.9.png Binary files differnew file mode 100644 index 000000000000..c453506c5049 --- /dev/null +++ b/core/res/res/drawable-mdpi/list_selected_holo_dark.9.png diff --git a/core/res/res/drawable-mdpi/list_selected_holo_light.9.png b/core/res/res/drawable-mdpi/list_selected_holo_light.9.png Binary files differnew file mode 100644 index 000000000000..58b6b3c924c9 --- /dev/null +++ b/core/res/res/drawable-mdpi/list_selected_holo_light.9.png diff --git a/core/res/res/drawable/activated_background_holo_dark.xml b/core/res/res/drawable/activated_background_holo_dark.xml index f71235e7d99a..febf2c40ef86 100644 --- a/core/res/res/drawable/activated_background_holo_dark.xml +++ b/core/res/res/drawable/activated_background_holo_dark.xml @@ -15,6 +15,6 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_activated="true" android:drawable="@android:drawable/list_selector_activated_holo_dark" /> + <item android:state_activated="true" android:drawable="@android:drawable/list_activated_holo" /> <item android:drawable="@color/transparent" /> </selector> diff --git a/core/res/res/drawable/activated_background_holo_light.xml b/core/res/res/drawable/activated_background_holo_light.xml index 615033d35c3b..febf2c40ef86 100644 --- a/core/res/res/drawable/activated_background_holo_light.xml +++ b/core/res/res/drawable/activated_background_holo_light.xml @@ -15,6 +15,6 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_activated="true" android:drawable="@android:drawable/list_selector_activated_holo_light" /> + <item android:state_activated="true" android:drawable="@android:drawable/list_activated_holo" /> <item android:drawable="@color/transparent" /> </selector> diff --git a/core/res/res/drawable/btn_default_holo_light.xml b/core/res/res/drawable/btn_default_holo_light.xml new file mode 100644 index 000000000000..61bb1bd4f6d0 --- /dev/null +++ b/core/res/res/drawable/btn_default_holo_light.xml @@ -0,0 +1,32 @@ +<?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:state_enabled="true" + android:drawable="@drawable/btn_default_normal_holo_light" /> + <item android:state_window_focused="false" android:state_enabled="false" + android:drawable="@drawable/btn_default_disabled_holo_light" /> + <item android:state_pressed="true" + android:drawable="@drawable/btn_default_pressed_holo_light" /> + <item android:state_focused="true" android:state_enabled="true" + android:drawable="@drawable/btn_default_focused_holo_light" /> + <item android:state_enabled="true" + android:drawable="@drawable/btn_default_normal_holo_light" /> + <item android:state_focused="true" + android:drawable="@drawable/btn_default_disabled_focused_holo_light" /> + <item + android:drawable="@drawable/btn_default_disabled_holo_light" /> +</selector> diff --git a/core/res/res/drawable/list_selector_background_transition_holo_dark.xml b/core/res/res/drawable/list_selector_background_transition_holo_dark.xml new file mode 100644 index 000000000000..7c6842605654 --- /dev/null +++ b/core/res/res/drawable/list_selector_background_transition_holo_dark.xml @@ -0,0 +1,20 @@ +<?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. +--> + +<transition xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:drawable="@android:drawable/list_pressed_holo_dark" /> + <item android:drawable="@android:drawable/list_longpressed_holo" /> +</transition> diff --git a/core/res/res/drawable/list_selector_background_transition_holo_light.xml b/core/res/res/drawable/list_selector_background_transition_holo_light.xml new file mode 100644 index 000000000000..fc08a845237c --- /dev/null +++ b/core/res/res/drawable/list_selector_background_transition_holo_light.xml @@ -0,0 +1,20 @@ +<?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. +--> + +<transition xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:drawable="@android:drawable/list_pressed_holo_light" /> + <item android:drawable="@android:drawable/list_longpressed_holo" /> +</transition> diff --git a/core/res/res/drawable/list_selector_holo_dark.xml b/core/res/res/drawable/list_selector_holo_dark.xml index 9cc993a9ccaf..e4c5c524e87a 100644 --- a/core/res/res/drawable/list_selector_holo_dark.xml +++ b/core/res/res/drawable/list_selector_holo_dark.xml @@ -21,7 +21,7 @@ <!-- 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" /> - <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_focused_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" /> </selector> diff --git a/core/res/res/drawable/list_selector_holo_light.xml b/core/res/res/drawable/list_selector_holo_light.xml index f2def40e0757..17631bdf850f 100644 --- a/core/res/res/drawable/list_selector_holo_light.xml +++ b/core/res/res/drawable/list_selector_holo_light.xml @@ -21,8 +21,8 @@ <!-- 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" /> - <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_focused_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" /> </selector> diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml index 5e77ee1bb8bc..7ed5a1bf2e12 100644 --- a/core/res/res/values/styles.xml +++ b/core/res/res/values/styles.xml @@ -1289,7 +1289,7 @@ </style> <style name="Widget.Holo.TextView.ListSeparator" parent="Widget.TextView.ListSeparator"> - <item name="android:background">@android:drawable/list_section_header_holo_dark</item> + <item name="android:background">@android:drawable/list_section_divider_holo_dark</item> </style> <style name="Widget.Holo.TextSelectHandle" parent="Widget.TextSelectHandle"> @@ -1521,6 +1521,12 @@ </style> <style name="Widget.Holo.Light.Button" parent="Widget.Button"> + <item name="android:background">@android:drawable/btn_default_holo_light</item> + <item name="android:textAppearance">?android:attr/textAppearanceMedium</item> + <item name="android:textColor">@android:color/primary_text_holo_light</item> + <item name="android:minHeight">48dip</item> + <item name="android:paddingLeft">32dip</item> + <item name="android:paddingRight">32dip</item> </style> <style name="Widget.Holo.Light.Button.Small"> @@ -1556,7 +1562,7 @@ </style> <style name="Widget.Holo.Light.TextView.ListSeparator" parent="Widget.TextView.ListSeparator"> - <item name="android:background">@android:drawable/list_section_header_holo_light</item> + <item name="android:background">@android:drawable/list_section_divider_holo_light</item> </style> <style name="Widget.Holo.Light.TextSelectHandle" parent="Widget.TextSelectHandle"> diff --git a/core/res/res/values/themes.xml b/core/res/res/values/themes.xml index d698ab3b08ba..25951a1522d9 100644 --- a/core/res/res/values/themes.xml +++ b/core/res/res/values/themes.xml @@ -703,7 +703,7 @@ <item name="listPreferredItemHeight">64dip</item> <!-- @hide --> <item name="searchResultListItemHeight">58dip</item> - <item name="listDivider">@drawable/divider_horizontal_holo_dark</item> + <item name="listDivider">@drawable/list_divider_horizontal_holo_dark</item> <item name="listSeparatorTextViewStyle">@android:style/Widget.Holo.TextView.ListSeparator</item> <item name="listChoiceIndicatorSingle">@android:drawable/btn_radio_holo_dark</item> @@ -713,7 +713,7 @@ <item name="activatedBackgroundIndicator">@android:drawable/activated_background_holo_dark</item> - <item name="listDividerAlertDialog">@android:drawable/divider_horizontal_holo_dark</item> + <item name="listDividerAlertDialog">@android:drawable/list_divider_horizontal_holo_dark</item> <item name="expandableListPreferredItemPaddingLeft">40dip</item> <item name="expandableListPreferredChildPaddingLeft"> |
