diff options
105 files changed, 1615 insertions, 562 deletions
diff --git a/core/res/res/color/primary_text_disable_only_quantum_dark.xml b/core/res/res/color/primary_text_disable_only_quantum_dark.xml index 2a6c33cd14ce..60a91f2cc0db 100644 --- a/core/res/res/color/primary_text_disable_only_quantum_dark.xml +++ b/core/res/res/color/primary_text_disable_only_quantum_dark.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 The Android Open Source Project +<!-- Copyright (C) 2014 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. @@ -15,6 +15,6 @@ --> <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:color="@android:color/bright_foreground_dark"/> + <item android:state_enabled="false" android:alpha="0.5" android:color="@android:color/bright_foreground_quantum_dark"/> + <item android:color="@android:color/bright_foreground_quantum_dark"/> </selector> diff --git a/core/res/res/color/primary_text_disable_only_quantum_light.xml b/core/res/res/color/primary_text_disable_only_quantum_light.xml index ff83f6a4d724..ced90517e8f9 100644 --- a/core/res/res/color/primary_text_disable_only_quantum_light.xml +++ b/core/res/res/color/primary_text_disable_only_quantum_light.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 The Android Open Source Project +<!-- Copyright (C) 2014 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. @@ -15,6 +15,6 @@ --> <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:color="@android:color/bright_foreground_light"/> + <item android:state_enabled="false" android:alpha="0.5" android:color="@android:color/bright_foreground_quantum_light"/> + <item android:color="@android:color/bright_foreground_quantum_light"/> </selector> diff --git a/core/res/res/color/primary_text_quantum_dark.xml b/core/res/res/color/primary_text_quantum_dark.xml deleted file mode 100644 index 65f49ae3733a..000000000000 --- a/core/res/res/color/primary_text_quantum_dark.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?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_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"/> -</selector> diff --git a/core/res/res/color/primary_text_quantum_light.xml b/core/res/res/color/primary_text_quantum_light.xml deleted file mode 100644 index 372745d2433d..000000000000 --- a/core/res/res/color/primary_text_quantum_light.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?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_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"/> -</selector> diff --git a/core/res/res/color/search_url_text_quantum_dark.xml b/core/res/res/color/search_url_text_quantum_dark.xml index 62337bd91ef1..5263fd70b682 100644 --- a/core/res/res/color/search_url_text_quantum_dark.xml +++ b/core/res/res/color/search_url_text_quantum_dark.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 The Android Open Source Project +<!-- Copyright (C) 2014 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. diff --git a/core/res/res/color/search_url_text_quantum_light.xml b/core/res/res/color/search_url_text_quantum_light.xml index 62337bd91ef1..5263fd70b682 100644 --- a/core/res/res/color/search_url_text_quantum_light.xml +++ b/core/res/res/color/search_url_text_quantum_light.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 The Android Open Source Project +<!-- Copyright (C) 2014 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. diff --git a/core/res/res/color/secondary_text_quantum_dark.xml b/core/res/res/color/secondary_text_quantum_dark.xml deleted file mode 100644 index fb7a07a3bb95..000000000000 --- a/core/res/res/color/secondary_text_quantum_dark.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?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="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_disabled_holo_dark"/> - <item android:state_pressed="true" android:state_enabled="false" android:color="@android:color/dim_foreground_disabled_holo_dark"/> - <item android:state_selected="true" android:color="@android:color/dim_foreground_holo_dark"/> - <item android:state_activated="true" android:color="@android:color/bright_foreground_holo_dark"/> - <item android:state_pressed="true" android:color="@android:color/dim_foreground_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"/> -</selector> diff --git a/core/res/res/color/secondary_text_quantum_light.xml b/core/res/res/color/secondary_text_quantum_light.xml deleted file mode 100644 index 744ace552f6b..000000000000 --- a/core/res/res/color/secondary_text_quantum_light.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?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="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_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"/> -</selector> diff --git a/core/res/res/color/tertiary_text_quantum_dark.xml b/core/res/res/color/tertiary_text_quantum_dark.xml deleted file mode 100644 index cb3956559d09..000000000000 --- a/core/res/res/color/tertiary_text_quantum_dark.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?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_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_holo_light"/> - <item android:color="#808080"/> -</selector> diff --git a/core/res/res/color/tertiary_text_quantum_light.xml b/core/res/res/color/tertiary_text_quantum_light.xml deleted file mode 100644 index b23162a944ab..000000000000 --- a/core/res/res/color/tertiary_text_quantum_light.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?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_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="#808080"/> - <item android:color="#808080"/> -</selector> diff --git a/core/res/res/drawable-xxhdpi/ab_solid_shadow_qntm.9.png b/core/res/res/drawable-xxhdpi/ab_solid_shadow_qntm.9.png Binary files differnew file mode 100644 index 000000000000..e89c9fe81b60 --- /dev/null +++ b/core/res/res/drawable-xxhdpi/ab_solid_shadow_qntm.9.png diff --git a/core/res/res/drawable-xxhdpi/ab_transparent_qntm_alpha.9.png b/core/res/res/drawable-xxhdpi/ab_transparent_qntm_alpha.9.png Binary files differnew file mode 100644 index 000000000000..f220168bcc1f --- /dev/null +++ b/core/res/res/drawable-xxhdpi/ab_transparent_qntm_alpha.9.png diff --git a/core/res/res/drawable-xxhdpi/btn_check_off_qntm_alpha.png b/core/res/res/drawable-xxhdpi/btn_check_off_qntm_alpha.png Binary files differnew file mode 100644 index 000000000000..2a1786105ffb --- /dev/null +++ b/core/res/res/drawable-xxhdpi/btn_check_off_qntm_alpha.png diff --git a/core/res/res/drawable-xxhdpi/btn_check_on_qntm_alpha.png b/core/res/res/drawable-xxhdpi/btn_check_on_qntm_alpha.png Binary files differnew file mode 100644 index 000000000000..61067ac34457 --- /dev/null +++ b/core/res/res/drawable-xxhdpi/btn_check_on_qntm_alpha.png diff --git a/core/res/res/drawable-xxhdpi/btn_qntm_alpha.9.png b/core/res/res/drawable-xxhdpi/btn_qntm_alpha.9.png Binary files differnew file mode 100644 index 000000000000..7d29d1823b8f --- /dev/null +++ b/core/res/res/drawable-xxhdpi/btn_qntm_alpha.9.png diff --git a/core/res/res/drawable-xxhdpi/btn_radio_off_pressed_qntm_alpha.png b/core/res/res/drawable-xxhdpi/btn_radio_off_pressed_qntm_alpha.png Binary files differnew file mode 100644 index 000000000000..fdbbbce4f55f --- /dev/null +++ b/core/res/res/drawable-xxhdpi/btn_radio_off_pressed_qntm_alpha.png diff --git a/core/res/res/drawable-xxhdpi/btn_radio_off_qntm_alpha.png b/core/res/res/drawable-xxhdpi/btn_radio_off_qntm_alpha.png Binary files differnew file mode 100644 index 000000000000..0ec2ee690ea3 --- /dev/null +++ b/core/res/res/drawable-xxhdpi/btn_radio_off_qntm_alpha.png diff --git a/core/res/res/drawable-xxhdpi/btn_radio_on_pressed_qntm_alpha.png b/core/res/res/drawable-xxhdpi/btn_radio_on_pressed_qntm_alpha.png Binary files differnew file mode 100644 index 000000000000..b46ee1c528ed --- /dev/null +++ b/core/res/res/drawable-xxhdpi/btn_radio_on_pressed_qntm_alpha.png diff --git a/core/res/res/drawable-xxhdpi/btn_radio_on_qntm_alpha.png b/core/res/res/drawable-xxhdpi/btn_radio_on_qntm_alpha.png Binary files differnew file mode 100644 index 000000000000..8737156aaf79 --- /dev/null +++ b/core/res/res/drawable-xxhdpi/btn_radio_on_qntm_alpha.png diff --git a/core/res/res/drawable-xxhdpi/fastscroll_thumb_qntm_alpha.png b/core/res/res/drawable-xxhdpi/fastscroll_thumb_qntm_alpha.png Binary files differnew file mode 100644 index 000000000000..55a73e744aae --- /dev/null +++ b/core/res/res/drawable-xxhdpi/fastscroll_thumb_qntm_alpha.png diff --git a/core/res/res/drawable-xxhdpi/fastscroll_track_qntm_alpha.9.png b/core/res/res/drawable-xxhdpi/fastscroll_track_qntm_alpha.9.png Binary files differnew file mode 100644 index 000000000000..be64a94a8b0c --- /dev/null +++ b/core/res/res/drawable-xxhdpi/fastscroll_track_qntm_alpha.9.png diff --git a/core/res/res/drawable-xxhdpi/ic_ab_back_quantum_am_alpha.png b/core/res/res/drawable-xxhdpi/ic_ab_back_quantum_am_alpha.png Binary files differnew file mode 100644 index 000000000000..ca15853f073e --- /dev/null +++ b/core/res/res/drawable-xxhdpi/ic_ab_back_quantum_am_alpha.png diff --git a/core/res/res/drawable-xxhdpi/ic_cab_done_qntm_alpha.png b/core/res/res/drawable-xxhdpi/ic_cab_done_qntm_alpha.png Binary files differnew file mode 100644 index 000000000000..1f9c734187ac --- /dev/null +++ b/core/res/res/drawable-xxhdpi/ic_cab_done_qntm_alpha.png diff --git a/core/res/res/drawable-xxhdpi/ic_dialog_alert_qntm_alpha.png b/core/res/res/drawable-xxhdpi/ic_dialog_alert_qntm_alpha.png Binary files differnew file mode 100644 index 000000000000..10e07562e95f --- /dev/null +++ b/core/res/res/drawable-xxhdpi/ic_dialog_alert_qntm_alpha.png diff --git a/core/res/res/drawable-xxhdpi/ic_find_next_qntm_alpha.png b/core/res/res/drawable-xxhdpi/ic_find_next_qntm_alpha.png Binary files differnew file mode 100644 index 000000000000..e3a7e9e68f77 --- /dev/null +++ b/core/res/res/drawable-xxhdpi/ic_find_next_qntm_alpha.png diff --git a/core/res/res/drawable-xxhdpi/ic_find_previous_qntm_alpha.png b/core/res/res/drawable-xxhdpi/ic_find_previous_qntm_alpha.png Binary files differnew file mode 100644 index 000000000000..f9cf16cf011c --- /dev/null +++ b/core/res/res/drawable-xxhdpi/ic_find_previous_qntm_alpha.png diff --git a/core/res/res/drawable-xxhdpi/ic_menu_copy_quantum_am_alpha.png b/core/res/res/drawable-xxhdpi/ic_menu_copy_quantum_am_alpha.png Binary files differnew file mode 100644 index 000000000000..7c3a58b29c87 --- /dev/null +++ b/core/res/res/drawable-xxhdpi/ic_menu_copy_quantum_am_alpha.png diff --git a/core/res/res/drawable-xxhdpi/ic_menu_cut_qntm_alpha.png b/core/res/res/drawable-xxhdpi/ic_menu_cut_qntm_alpha.png Binary files differnew file mode 100644 index 000000000000..2200642f863a --- /dev/null +++ b/core/res/res/drawable-xxhdpi/ic_menu_cut_qntm_alpha.png diff --git a/core/res/res/drawable-xxhdpi/ic_menu_find_qntm_alpha.png b/core/res/res/drawable-xxhdpi/ic_menu_find_qntm_alpha.png Binary files differnew file mode 100644 index 000000000000..d35b337f2f80 --- /dev/null +++ b/core/res/res/drawable-xxhdpi/ic_menu_find_qntm_alpha.png diff --git a/core/res/res/drawable-xxhdpi/ic_menu_moreoverflow_qntm_alpha.png b/core/res/res/drawable-xxhdpi/ic_menu_moreoverflow_qntm_alpha.png Binary files differnew file mode 100644 index 000000000000..ff1759b8f94a --- /dev/null +++ b/core/res/res/drawable-xxhdpi/ic_menu_moreoverflow_qntm_alpha.png diff --git a/core/res/res/drawable-xxhdpi/ic_menu_paste_quantum_am_alpha.png b/core/res/res/drawable-xxhdpi/ic_menu_paste_quantum_am_alpha.png Binary files differnew file mode 100644 index 000000000000..28c0ae0ee600 --- /dev/null +++ b/core/res/res/drawable-xxhdpi/ic_menu_paste_quantum_am_alpha.png diff --git a/core/res/res/drawable-xxhdpi/ic_menu_search_qntm_alpha.png b/core/res/res/drawable-xxhdpi/ic_menu_search_qntm_alpha.png Binary files differnew file mode 100644 index 000000000000..cb295a3f1a3d --- /dev/null +++ b/core/res/res/drawable-xxhdpi/ic_menu_search_qntm_alpha.png diff --git a/core/res/res/drawable-xxhdpi/ic_menu_selectall_qntm_alpha.png b/core/res/res/drawable-xxhdpi/ic_menu_selectall_qntm_alpha.png Binary files differnew file mode 100644 index 000000000000..6430d450ca95 --- /dev/null +++ b/core/res/res/drawable-xxhdpi/ic_menu_selectall_qntm_alpha.png diff --git a/core/res/res/drawable-xxhdpi/ic_menu_share_qntm_alpha.png b/core/res/res/drawable-xxhdpi/ic_menu_share_qntm_alpha.png Binary files differnew file mode 100644 index 000000000000..66f7d1627b55 --- /dev/null +++ b/core/res/res/drawable-xxhdpi/ic_menu_share_qntm_alpha.png diff --git a/core/res/res/drawable-xxhdpi/list_divider_qntm_alpha.9.png b/core/res/res/drawable-xxhdpi/list_divider_qntm_alpha.9.png Binary files differnew file mode 100644 index 000000000000..0fafd1a049df --- /dev/null +++ b/core/res/res/drawable-xxhdpi/list_divider_qntm_alpha.9.png diff --git a/core/res/res/drawable-xxhdpi/list_section_divider_qntm_alpha.9.png b/core/res/res/drawable-xxhdpi/list_section_divider_qntm_alpha.9.png Binary files differnew file mode 100644 index 000000000000..491fab9358a5 --- /dev/null +++ b/core/res/res/drawable-xxhdpi/list_section_divider_qntm_alpha.9.png diff --git a/core/res/res/drawable-xxhdpi/scrollbar_handle_qntm_alpha.9.png b/core/res/res/drawable-xxhdpi/scrollbar_handle_qntm_alpha.9.png Binary files differnew file mode 100644 index 000000000000..c1c0622112e9 --- /dev/null +++ b/core/res/res/drawable-xxhdpi/scrollbar_handle_qntm_alpha.9.png diff --git a/core/res/res/drawable-xxhdpi/text_cursor_qntm_alpha.9.png b/core/res/res/drawable-xxhdpi/text_cursor_qntm_alpha.9.png Binary files differnew file mode 100644 index 000000000000..432c3859f98b --- /dev/null +++ b/core/res/res/drawable-xxhdpi/text_cursor_qntm_alpha.9.png diff --git a/core/res/res/drawable-xxhdpi/textfield_activated_qntm_alpha.9.png b/core/res/res/drawable-xxhdpi/textfield_activated_qntm_alpha.9.png Binary files differnew file mode 100644 index 000000000000..a22f35203e79 --- /dev/null +++ b/core/res/res/drawable-xxhdpi/textfield_activated_qntm_alpha.9.png diff --git a/core/res/res/drawable-xxhdpi/textfield_default_qntm_alpha.9.png b/core/res/res/drawable-xxhdpi/textfield_default_qntm_alpha.9.png Binary files differnew file mode 100644 index 000000000000..b0504e031683 --- /dev/null +++ b/core/res/res/drawable-xxhdpi/textfield_default_qntm_alpha.9.png diff --git a/core/res/res/drawable/ab_transparent_quantum_dark.xml b/core/res/res/drawable/ab_transparent_quantum_dark.xml new file mode 100644 index 000000000000..9ac2fc0a082d --- /dev/null +++ b/core/res/res/drawable/ab_transparent_quantum_dark.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> + +<bitmap xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/ab_transparent_qntm_alpha" + android:tint="@color/control_normal_foreground_quantum_dark" /> diff --git a/core/res/res/drawable/ab_transparent_quantum_light.xml b/core/res/res/drawable/ab_transparent_quantum_light.xml new file mode 100644 index 000000000000..bc49848ae582 --- /dev/null +++ b/core/res/res/drawable/ab_transparent_quantum_light.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> + +<bitmap xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/ab_transparent_qntm_alpha" + android:tint="@color/control_normal_foreground_quantum_light" /> diff --git a/core/res/res/color/primary_text_nodisable_quantum_light.xml b/core/res/res/drawable/activated_background_quantum_dark.xml index fde143f1cc2e..a9e3fea64639 100644 --- a/core/res/res/color/primary_text_nodisable_quantum_light.xml +++ b/core/res/res/drawable/activated_background_quantum_dark.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 The Android Open Source Project +<!-- Copyright (C) 2014 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. @@ -15,7 +15,6 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <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"/> + <item android:state_activated="true" android:drawable="@color/control_activated_foreground_quantum_dark" /> + <item android:drawable="@color/transparent" /> </selector> diff --git a/core/res/res/color/secondary_text_nodisable_quantum_light.xml b/core/res/res/drawable/activated_background_quantum_light.xml index 3ab25a0a61e6..5d10ea2b1beb 100644 --- a/core/res/res/color/secondary_text_nodisable_quantum_light.xml +++ b/core/res/res/drawable/activated_background_quantum_light.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 The Android Open Source Project +<!-- Copyright (C) 2014 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. @@ -15,7 +15,6 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <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:color="@android:color/dim_foreground_dark"/> + <item android:state_activated="true" android:drawable="@color/control_activated_foreground_quantum_light" /> + <item android:drawable="@color/transparent" /> </selector> diff --git a/core/res/res/drawable/background_cache_hint_selector_quantum_dark.xml b/core/res/res/drawable/background_cache_hint_selector_quantum_dark.xml index 7d64abc2d0e3..ab6650177da1 100644 --- a/core/res/res/drawable/background_cache_hint_selector_quantum_dark.xml +++ b/core/res/res/drawable/background_cache_hint_selector_quantum_dark.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 The Android Open Source Project +<!-- Copyright (C) 2014 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. diff --git a/core/res/res/drawable/background_cache_hint_selector_quantum_light.xml b/core/res/res/drawable/background_cache_hint_selector_quantum_light.xml index 3fc348315f1e..fb940a9038ac 100644 --- a/core/res/res/drawable/background_cache_hint_selector_quantum_light.xml +++ b/core/res/res/drawable/background_cache_hint_selector_quantum_light.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 The Android Open Source Project +<!-- Copyright (C) 2014 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. diff --git a/core/res/res/drawable/btn_borderless_quantum_dark.xml b/core/res/res/drawable/btn_borderless_quantum_dark.xml new file mode 100644 index 000000000000..e1bff4fb71b6 --- /dev/null +++ b/core/res/res/drawable/btn_borderless_quantum_dark.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> + +<reveal xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:drawable="@color/transparent" /> + <item> + <nine-patch android:src="@drawable/btn_qntm_alpha" + android:tint="@color/btn_default_pressed_quantum_dark" /> + </item> +</reveal> diff --git a/core/res/res/drawable/btn_borderless_quantum_light.xml b/core/res/res/drawable/btn_borderless_quantum_light.xml new file mode 100644 index 000000000000..e7a95b19b88e --- /dev/null +++ b/core/res/res/drawable/btn_borderless_quantum_light.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> + +<reveal xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:drawable="@color/transparent" /> + <item> + <nine-patch android:src="@drawable/btn_qntm_alpha" + android:tint="@color/btn_default_pressed_quantum_light" /> + </item> +</reveal> diff --git a/core/res/res/drawable/btn_check_quantum_dark.xml b/core/res/res/drawable/btn_check_quantum_dark.xml new file mode 100644 index 000000000000..a35bec44001b --- /dev/null +++ b/core/res/res/drawable/btn_check_quantum_dark.xml @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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_checked="true" android:state_pressed="true"> + <bitmap android:src="@drawable/btn_check_on_qntm_alpha" + android:tint="@color/control_activated_foreground_quantum_dark" /> + </item> + <item android:state_checked="true"> + <bitmap android:src="@drawable/btn_check_on_qntm_alpha" + android:tint="@color/control_activated_foreground_quantum_dark" /> + </item> + <item android:state_pressed="true"> + <bitmap android:src="@drawable/btn_check_off_qntm_alpha" + android:tint="@color/control_activated_foreground_quantum_dark" /> + </item> + <item> + <bitmap android:src="@drawable/btn_check_off_qntm_alpha" + android:tint="@color/control_normal_foreground_quantum_dark" /> + </item> +</selector> diff --git a/core/res/res/drawable/btn_check_quantum_light.xml b/core/res/res/drawable/btn_check_quantum_light.xml new file mode 100644 index 000000000000..8588fce0dea6 --- /dev/null +++ b/core/res/res/drawable/btn_check_quantum_light.xml @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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_checked="true" android:state_pressed="true"> + <bitmap android:src="@drawable/btn_check_on_qntm_alpha" + android:tint="@color/control_activated_foreground_quantum_light" /> + </item> + <item android:state_checked="true"> + <bitmap android:src="@drawable/btn_check_on_qntm_alpha" + android:tint="@color/control_activated_foreground_quantum_light" /> + </item> + <item android:state_pressed="true"> + <bitmap android:src="@drawable/btn_check_off_qntm_alpha" + android:tint="@color/control_activated_foreground_quantum_light" /> + </item> + <item> + <bitmap android:src="@drawable/btn_check_off_qntm_alpha" + android:tint="@color/control_normal_foreground_quantum_light" /> + </item> +</selector> diff --git a/core/res/res/drawable/btn_color_quantum_dark.xml b/core/res/res/drawable/btn_color_quantum_dark.xml new file mode 100644 index 000000000000..5e44a784492a --- /dev/null +++ b/core/res/res/drawable/btn_color_quantum_dark.xml @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> + +<reveal xmlns:android="http://schemas.android.com/apk/res/android"> + <item> + <selector> + <item android:state_enabled="false"> + <nine-patch android:src="@drawable/btn_qntm_alpha" + android:tint="@color/btn_default_normal_quantum_light" /> + </item> + <item> + <nine-patch android:src="@drawable/btn_qntm_alpha" + android:tint="@color/theme_color_500" /> + </item> + </selector> + </item> + <item> + <nine-patch android:src="@drawable/btn_qntm_alpha" + android:tint="@color/theme_color_300" /> + </item> +</reveal> diff --git a/core/res/res/drawable/btn_color_quantum_light.xml b/core/res/res/drawable/btn_color_quantum_light.xml new file mode 100644 index 000000000000..d6be95892f16 --- /dev/null +++ b/core/res/res/drawable/btn_color_quantum_light.xml @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> + +<reveal xmlns:android="http://schemas.android.com/apk/res/android"> + <item> + <selector> + <item android:state_enabled="false"> + <nine-patch android:src="@drawable/btn_qntm_alpha" + android:tint="@color/btn_default_normal_quantum_dark" /> + </item> + <item> + <nine-patch android:src="@drawable/btn_qntm_alpha" + android:tint="@color/theme_color_500" /> + </item> + </selector> + </item> + <item> + <nine-patch android:src="@drawable/btn_qntm_alpha" + android:tint="@color/theme_color_700" /> + </item> +</reveal> diff --git a/core/res/res/drawable/btn_default_quantum_dark.xml b/core/res/res/drawable/btn_default_quantum_dark.xml index 84b109006410..7f0cca83b48e 100644 --- a/core/res/res/drawable/btn_default_quantum_dark.xml +++ b/core/res/res/drawable/btn_default_quantum_dark.xml @@ -16,20 +16,11 @@ <reveal xmlns:android="http://schemas.android.com/apk/res/android"> <item> - <selector> - <item android:state_window_focused="false" android:state_enabled="true" - android:drawable="@drawable/btn_default_normal_holo_dark" /> - <item android:state_window_focused="false" android:state_enabled="false" - android:drawable="@drawable/btn_default_disabled_holo_dark" /> - <item android:state_focused="true" android:state_enabled="true" - android:drawable="@drawable/btn_default_focused_holo_dark" /> - <item android:state_enabled="true" - android:drawable="@drawable/btn_default_normal_holo_dark" /> - <item android:state_focused="true" - android:drawable="@drawable/btn_default_disabled_focused_holo_dark" /> - <item - android:drawable="@drawable/btn_default_disabled_holo_dark" /> - </selector> + <nine-patch android:src="@drawable/btn_qntm_alpha" + android:tint="@color/btn_default_normal_quantum_dark" /> + </item> + <item> + <nine-patch android:src="@drawable/btn_qntm_alpha" + android:tint="@color/btn_default_pressed_quantum_dark" /> </item> - <item android:drawable="@drawable/btn_default_pressed_holo_dark" /> </reveal> diff --git a/core/res/res/drawable/btn_default_quantum_light.xml b/core/res/res/drawable/btn_default_quantum_light.xml index b5591989000e..e391a803e825 100644 --- a/core/res/res/drawable/btn_default_quantum_light.xml +++ b/core/res/res/drawable/btn_default_quantum_light.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2013 The Android Open Source Project +<!-- Copyright (C) 2014 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. @@ -16,20 +16,11 @@ <reveal xmlns:android="http://schemas.android.com/apk/res/android"> <item> - <selector> - <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_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> + <nine-patch android:src="@drawable/btn_qntm_alpha" + android:tint="@color/btn_default_normal_quantum_light" /> + </item> + <item> + <nine-patch android:src="@drawable/btn_qntm_alpha" + android:tint="@color/btn_default_pressed_quantum_light" /> </item> - <item android:drawable="@drawable/btn_default_pressed_holo_light" /> </reveal> diff --git a/core/res/res/drawable/btn_radio_quantum_dark.xml b/core/res/res/drawable/btn_radio_quantum_dark.xml new file mode 100644 index 000000000000..54f4f9a4abda --- /dev/null +++ b/core/res/res/drawable/btn_radio_quantum_dark.xml @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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_checked="true" android:state_enabled="true" android:state_pressed="true"> + <bitmap android:src="@drawable/btn_radio_on_pressed_qntm_alpha" + android:tint="@color/control_activated_foreground_quantum_dark" /> + </item> + <item android:state_checked="true"> + <bitmap android:src="@drawable/btn_radio_on_qntm_alpha" + android:tint="@color/control_activated_foreground_quantum_dark" /> + </item> + <item android:state_enabled="true" android:state_pressed="true"> + <bitmap android:src="@drawable/btn_radio_off_pressed_qntm_alpha" + android:tint="@color/control_activated_foreground_quantum_dark" /> + </item> + <item> + <bitmap android:src="@drawable/btn_radio_off_qntm_alpha" + android:tint="@color/control_normal_foreground_quantum_dark" /> + </item> +</selector> diff --git a/core/res/res/drawable/btn_radio_quantum_light.xml b/core/res/res/drawable/btn_radio_quantum_light.xml new file mode 100644 index 000000000000..c1ace70b5f93 --- /dev/null +++ b/core/res/res/drawable/btn_radio_quantum_light.xml @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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_checked="true" android:state_enabled="true" android:state_pressed="true"> + <bitmap android:src="@drawable/btn_radio_on_pressed_qntm_alpha" + android:tint="@color/control_activated_foreground_quantum_light" /> + </item> + <item android:state_checked="true"> + <bitmap android:src="@drawable/btn_radio_on_qntm_alpha" + android:tint="@color/control_activated_foreground_quantum_light" /> + </item> + <item android:state_enabled="true" android:state_pressed="true"> + <bitmap android:src="@drawable/btn_radio_off_pressed_qntm_alpha" + android:tint="@color/control_activated_foreground_quantum_light" /> + </item> + <item> + <bitmap android:src="@drawable/btn_radio_off_qntm_alpha" + android:tint="@color/control_normal_foreground_quantum_light" /> + </item> +</selector> diff --git a/core/res/res/drawable/edit_text_quantum_dark.xml b/core/res/res/drawable/edit_text_quantum_dark.xml new file mode 100644 index 000000000000..ea3fc52d12dd --- /dev/null +++ b/core/res/res/drawable/edit_text_quantum_dark.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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"> + <nine-patch android:src="@drawable/textfield_default_qntm_alpha" + android:tint="@color/control_normal_foreground_quantum_dark" /> + </item> + <item android:state_window_focused="false" android:state_enabled="false"> + <nine-patch android:src="@drawable/textfield_default_qntm_alpha" + android:tint="@color/control_normal_foreground_quantum_dark" /> + </item> + <item android:state_enabled="true" android:state_focused="true"> + <nine-patch android:src="@drawable/textfield_activated_qntm_alpha" + android:tint="@color/control_activated_foreground_quantum_dark" /> + </item> + <item android:state_enabled="true" android:state_activated="true"> + <nine-patch android:src="@drawable/textfield_activated_qntm_alpha" + android:tint="@color/control_activated_foreground_quantum_dark" /> + </item> + <item android:state_enabled="true"> + <nine-patch android:src="@drawable/textfield_default_qntm_alpha" + android:tint="@color/control_normal_foreground_quantum_dark" /> + </item> + <item> + <nine-patch android:src="@drawable/textfield_default_qntm_alpha" + android:tint="@color/control_normal_foreground_quantum_dark" /> + </item> +</selector> diff --git a/core/res/res/drawable/edit_text_quantum_light.xml b/core/res/res/drawable/edit_text_quantum_light.xml new file mode 100644 index 000000000000..dd7fe5399013 --- /dev/null +++ b/core/res/res/drawable/edit_text_quantum_light.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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"> + <nine-patch android:src="@drawable/textfield_default_qntm_alpha" + android:tint="@color/control_normal_foreground_quantum_light" /> + </item> + <item android:state_window_focused="false" android:state_enabled="false"> + <nine-patch android:src="@drawable/textfield_default_qntm_alpha" + android:tint="@color/control_normal_foreground_quantum_light" /> + </item> + <item android:state_enabled="true" android:state_focused="true"> + <nine-patch android:src="@drawable/textfield_activated_qntm_alpha" + android:tint="@color/control_activated_foreground_quantum_light" /> + </item> + <item android:state_enabled="true" android:state_activated="true"> + <nine-patch android:src="@drawable/textfield_activated_qntm_alpha" + android:tint="@color/control_activated_foreground_quantum_light" /> + </item> + <item android:state_enabled="true"> + <nine-patch android:src="@drawable/textfield_default_qntm_alpha" + android:tint="@color/control_normal_foreground_quantum_light" /> + </item> + <item> + <nine-patch android:src="@drawable/textfield_default_qntm_alpha" + android:tint="@color/control_normal_foreground_quantum_light" /> + </item> +</selector> diff --git a/core/res/res/color/primary_text_nodisable_quantum_dark.xml b/core/res/res/drawable/fastscroll_thumb_quantum_dark.xml index 1044428b7164..53c7fddb5455 100644 --- a/core/res/res/color/primary_text_nodisable_quantum_dark.xml +++ b/core/res/res/drawable/fastscroll_thumb_quantum_dark.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 The Android Open Source Project +<!-- Copyright (C) 2014 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. @@ -15,7 +15,12 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_selected="true" android:color="@android:color/bright_foreground_dark_inverse"/> - <item android:state_activated="true" android:color="@android:color/bright_foreground_dark_inverse"/> - <item android:color="@android:color/bright_foreground_dark"/> + <item android:state_pressed="true"> + <bitmap android:src="@drawable/fastscroll_thumb_qntm_alpha" + android:tint="@color/control_activated_foreground_quantum_dark" /> + </item> + <item> + <bitmap android:src="@drawable/fastscroll_thumb_qntm_alpha" + android:tint="@color/control_normal_foreground_quantum_dark" /> + </item> </selector> diff --git a/core/res/res/color/secondary_text_nodisable_quantum_dark.xml b/core/res/res/drawable/fastscroll_thumb_quantum_light.xml index 3ab25a0a61e6..3bc87e9d38cb 100644 --- a/core/res/res/color/secondary_text_nodisable_quantum_dark.xml +++ b/core/res/res/drawable/fastscroll_thumb_quantum_light.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 The Android Open Source Project +<!-- Copyright (C) 2014 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. @@ -15,7 +15,12 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <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:color="@android:color/dim_foreground_dark"/> + <item android:state_pressed="true"> + <bitmap android:src="@drawable/fastscroll_thumb_qntm_alpha" + android:tint="@color/control_activated_foreground_quantum_light" /> + </item> + <item> + <bitmap android:src="@drawable/fastscroll_thumb_qntm_alpha" + android:tint="@color/control_normal_foreground_quantum_light" /> + </item> </selector> diff --git a/core/res/res/drawable/fastscroll_track_quantum_dark.xml b/core/res/res/drawable/fastscroll_track_quantum_dark.xml new file mode 100644 index 000000000000..0ae57d270f29 --- /dev/null +++ b/core/res/res/drawable/fastscroll_track_quantum_dark.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> + +<nine-patch xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/fastscroll_track_qntm_alpha" + android:tint="@color/control_normal_foreground_quantum_light" /> diff --git a/core/res/res/drawable/fastscroll_track_quantum_light.xml b/core/res/res/drawable/fastscroll_track_quantum_light.xml new file mode 100644 index 000000000000..627c079e268f --- /dev/null +++ b/core/res/res/drawable/fastscroll_track_quantum_light.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> + +<nine-patch xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/fastscroll_track_qntm_alpha" + android:tint="@color/control_normal_foreground_quantum_dark" /> diff --git a/core/res/res/drawable/ic_ab_back_quantum_dark.xml b/core/res/res/drawable/ic_ab_back_quantum_dark.xml new file mode 100644 index 000000000000..6cebfe321d1b --- /dev/null +++ b/core/res/res/drawable/ic_ab_back_quantum_dark.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> + +<bitmap xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/ic_ab_back_quantum_am_alpha" + android:autoMirrored="true" + android:tint="@color/control_normal_foreground_quantum_dark" /> diff --git a/core/res/res/drawable/ic_ab_back_quantum_light.xml b/core/res/res/drawable/ic_ab_back_quantum_light.xml new file mode 100644 index 000000000000..870df9b6c170 --- /dev/null +++ b/core/res/res/drawable/ic_ab_back_quantum_light.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> + +<bitmap xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/ic_ab_back_quantum_am_alpha" + android:autoMirrored="true" + android:tint="@color/control_normal_foreground_quantum_light" /> diff --git a/core/res/res/drawable/ic_cab_done_quantum_dark.xml b/core/res/res/drawable/ic_cab_done_quantum_dark.xml new file mode 100644 index 000000000000..472996e794e3 --- /dev/null +++ b/core/res/res/drawable/ic_cab_done_quantum_dark.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> + +<bitmap xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/ic_cab_done_qntm_alpha" + android:tint="@color/control_normal_foreground_quantum_dark" /> diff --git a/core/res/res/drawable/ic_cab_done_quantum_light.xml b/core/res/res/drawable/ic_cab_done_quantum_light.xml new file mode 100644 index 000000000000..d70a3f160627 --- /dev/null +++ b/core/res/res/drawable/ic_cab_done_quantum_light.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> + +<bitmap xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/ic_cab_done_qntm_alpha" + android:tint="@color/control_normal_foreground_quantum_light" /> diff --git a/core/res/res/drawable/ic_dialog_alert_quantum_dark.xml b/core/res/res/drawable/ic_dialog_alert_quantum_dark.xml new file mode 100644 index 000000000000..8b8cb0cb6fe8 --- /dev/null +++ b/core/res/res/drawable/ic_dialog_alert_quantum_dark.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> + +<bitmap xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/ic_dialog_alert_qntm_alpha" + android:tint="@color/control_normal_foreground_quantum_dark" /> diff --git a/core/res/res/drawable/ic_dialog_alert_quantum_light.xml b/core/res/res/drawable/ic_dialog_alert_quantum_light.xml new file mode 100644 index 000000000000..8b8cb0cb6fe8 --- /dev/null +++ b/core/res/res/drawable/ic_dialog_alert_quantum_light.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> + +<bitmap xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/ic_dialog_alert_qntm_alpha" + android:tint="@color/control_normal_foreground_quantum_dark" /> diff --git a/core/res/res/drawable/ic_find_next_quantum_dark.xml b/core/res/res/drawable/ic_find_next_quantum_dark.xml new file mode 100644 index 000000000000..929bea339454 --- /dev/null +++ b/core/res/res/drawable/ic_find_next_quantum_dark.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> + +<bitmap xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/ic_find_next_qntm_alpha" + android:tint="@color/control_normal_foreground_quantum_dark" /> diff --git a/core/res/res/drawable/ic_find_next_quantum_light.xml b/core/res/res/drawable/ic_find_next_quantum_light.xml new file mode 100644 index 000000000000..9c2032797ec5 --- /dev/null +++ b/core/res/res/drawable/ic_find_next_quantum_light.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> + +<bitmap xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/ic_find_next_qntm_alpha" + android:tint="@color/control_normal_foreground_quantum_light" /> diff --git a/core/res/res/drawable/ic_find_previous_quantum_dark.xml b/core/res/res/drawable/ic_find_previous_quantum_dark.xml new file mode 100644 index 000000000000..e944223bf8b4 --- /dev/null +++ b/core/res/res/drawable/ic_find_previous_quantum_dark.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> + +<bitmap xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/ic_find_previous_qntm_alpha" + android:tint="@color/control_normal_foreground_quantum_dark" /> diff --git a/core/res/res/drawable/ic_find_previous_quantum_light.xml b/core/res/res/drawable/ic_find_previous_quantum_light.xml new file mode 100644 index 000000000000..b037094e1f18 --- /dev/null +++ b/core/res/res/drawable/ic_find_previous_quantum_light.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> + +<bitmap xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/ic_find_previous_qntm_alpha" + android:tint="@color/control_normal_foreground_quantum_light" /> diff --git a/core/res/res/drawable/ic_menu_copy_quantum_dark.xml b/core/res/res/drawable/ic_menu_copy_quantum_dark.xml new file mode 100644 index 000000000000..4476cde237e7 --- /dev/null +++ b/core/res/res/drawable/ic_menu_copy_quantum_dark.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> + +<bitmap xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/ic_menu_copy_quantum_am_alpha" + android:tint="@color/control_normal_foreground_quantum_dark" + android:autoMirrored="true" /> diff --git a/core/res/res/drawable/ic_menu_copy_quantum_light.xml b/core/res/res/drawable/ic_menu_copy_quantum_light.xml new file mode 100644 index 000000000000..51906ed6affb --- /dev/null +++ b/core/res/res/drawable/ic_menu_copy_quantum_light.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> + +<bitmap xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/ic_menu_copy_quantum_am_alpha" + android:tint="@color/control_normal_foreground_quantum_light" + android:autoMirrored="true" /> diff --git a/core/res/res/drawable/ic_menu_cut_quantum_dark.xml b/core/res/res/drawable/ic_menu_cut_quantum_dark.xml new file mode 100644 index 000000000000..563400bd1365 --- /dev/null +++ b/core/res/res/drawable/ic_menu_cut_quantum_dark.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> + +<bitmap xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/ic_menu_cut_qntm_alpha" + android:tint="@color/control_normal_foreground_quantum_dark" /> diff --git a/core/res/res/drawable/ic_menu_cut_quantum_light.xml b/core/res/res/drawable/ic_menu_cut_quantum_light.xml new file mode 100644 index 000000000000..36c9442168ae --- /dev/null +++ b/core/res/res/drawable/ic_menu_cut_quantum_light.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> + +<bitmap xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/ic_menu_cut_qntm_alpha" + android:tint="@color/control_normal_foreground_quantum_light" /> diff --git a/core/res/res/drawable/ic_menu_find_quantum_dark.xml b/core/res/res/drawable/ic_menu_find_quantum_dark.xml new file mode 100644 index 000000000000..88034637eac3 --- /dev/null +++ b/core/res/res/drawable/ic_menu_find_quantum_dark.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> + +<bitmap xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/ic_menu_find_qntm_alpha" + android:tint="@color/control_normal_foreground_quantum_dark" /> diff --git a/core/res/res/drawable/ic_menu_find_quantum_light.xml b/core/res/res/drawable/ic_menu_find_quantum_light.xml new file mode 100644 index 000000000000..9b3bd73dd24c --- /dev/null +++ b/core/res/res/drawable/ic_menu_find_quantum_light.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> + +<bitmap xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/ic_menu_find_qntm_alpha" + android:tint="@color/control_normal_foreground_quantum_light" /> diff --git a/core/res/res/drawable/ic_menu_moreoverflow_quantum_dark.xml b/core/res/res/drawable/ic_menu_moreoverflow_quantum_dark.xml new file mode 100644 index 000000000000..9f39a6839ba6 --- /dev/null +++ b/core/res/res/drawable/ic_menu_moreoverflow_quantum_dark.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> + +<bitmap xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/ic_menu_moreoverflow_qntm_alpha" + android:tint="@color/control_normal_foreground_quantum_dark" /> diff --git a/core/res/res/drawable/ic_menu_moreoverflow_quantum_light.xml b/core/res/res/drawable/ic_menu_moreoverflow_quantum_light.xml new file mode 100644 index 000000000000..e15eaec9fc09 --- /dev/null +++ b/core/res/res/drawable/ic_menu_moreoverflow_quantum_light.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> + +<bitmap xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/ic_menu_moreoverflow_qntm_alpha" + android:tint="@color/control_normal_foreground_quantum_light" /> diff --git a/core/res/res/drawable/ic_menu_paste_quantum_dark.xml b/core/res/res/drawable/ic_menu_paste_quantum_dark.xml new file mode 100644 index 000000000000..5c59fa9c9fbe --- /dev/null +++ b/core/res/res/drawable/ic_menu_paste_quantum_dark.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> + +<bitmap xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/ic_menu_paste_quantum_am_alpha" + android:tint="@color/control_normal_foreground_quantum_dark" + android:autoMirrored="true" /> diff --git a/core/res/res/drawable/ic_menu_paste_quantum_light.xml b/core/res/res/drawable/ic_menu_paste_quantum_light.xml new file mode 100644 index 000000000000..97caada88710 --- /dev/null +++ b/core/res/res/drawable/ic_menu_paste_quantum_light.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> + +<bitmap xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/ic_menu_paste_quantum_am_alpha" + android:tint="@color/control_normal_foreground_quantum_light" + android:autoMirrored="true" /> diff --git a/core/res/res/drawable/ic_menu_search_quantum_dark.xml b/core/res/res/drawable/ic_menu_search_quantum_dark.xml new file mode 100644 index 000000000000..1c6efcd330fe --- /dev/null +++ b/core/res/res/drawable/ic_menu_search_quantum_dark.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> + +<bitmap xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/ic_menu_search_qntm_alpha" + android:tint="@color/control_normal_foreground_quantum_dark" /> diff --git a/core/res/res/drawable/ic_menu_search_quantum_light.xml b/core/res/res/drawable/ic_menu_search_quantum_light.xml new file mode 100644 index 000000000000..ba6efb6e3aa6 --- /dev/null +++ b/core/res/res/drawable/ic_menu_search_quantum_light.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> + +<bitmap xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/ic_menu_search_qntm_alpha" + android:tint="@color/control_normal_foreground_quantum_light" /> diff --git a/core/res/res/drawable/ic_menu_selectall_quantum_dark.xml b/core/res/res/drawable/ic_menu_selectall_quantum_dark.xml new file mode 100644 index 000000000000..c1d3e699b5c4 --- /dev/null +++ b/core/res/res/drawable/ic_menu_selectall_quantum_dark.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> + +<bitmap xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/ic_menu_selectall_qntm_alpha" + android:tint="@color/control_normal_foreground_quantum_dark" /> diff --git a/core/res/res/drawable/ic_menu_selectall_quantum_light.xml b/core/res/res/drawable/ic_menu_selectall_quantum_light.xml new file mode 100644 index 000000000000..4de8962234fd --- /dev/null +++ b/core/res/res/drawable/ic_menu_selectall_quantum_light.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> + +<bitmap xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/ic_menu_selectall_qntm_alpha" + android:tint="@color/control_normal_foreground_quantum_light" /> diff --git a/core/res/res/drawable/ic_menu_share_quantum_dark.xml b/core/res/res/drawable/ic_menu_share_quantum_dark.xml new file mode 100644 index 000000000000..a7c5afcde2e2 --- /dev/null +++ b/core/res/res/drawable/ic_menu_share_quantum_dark.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> + +<bitmap xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/ic_menu_share_qntm_alpha" + android:tint="@color/control_normal_foreground_quantum_dark" /> diff --git a/core/res/res/drawable/ic_menu_share_quantum_light.xml b/core/res/res/drawable/ic_menu_share_quantum_light.xml new file mode 100644 index 000000000000..9257c25c4423 --- /dev/null +++ b/core/res/res/drawable/ic_menu_share_quantum_light.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> + +<bitmap xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/ic_menu_share_qntm_alpha" + android:tint="@color/control_normal_foreground_quantum_light" /> diff --git a/core/res/res/drawable/item_background_borderless_quantum_dark.xml b/core/res/res/drawable/item_background_borderless_quantum_dark.xml new file mode 100644 index 000000000000..1caee4e723f1 --- /dev/null +++ b/core/res/res/drawable/item_background_borderless_quantum_dark.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> + +<touch-feedback xmlns:android="http://schemas.android.com/apk/res/android" + android:color="@color/lighter_gray" /> diff --git a/core/res/res/drawable/item_background_borderless_quantum_light.xml b/core/res/res/drawable/item_background_borderless_quantum_light.xml new file mode 100644 index 000000000000..ecf7dfb5d972 --- /dev/null +++ b/core/res/res/drawable/item_background_borderless_quantum_light.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> + +<touch-feedback xmlns:android="http://schemas.android.com/apk/res/android" + android:color="@color/darker_gray" /> diff --git a/core/res/res/drawable/list_divider_quantum_dark.xml b/core/res/res/drawable/list_divider_quantum_dark.xml new file mode 100644 index 000000000000..9d05b2f4e1d5 --- /dev/null +++ b/core/res/res/drawable/list_divider_quantum_dark.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> + +<nine-patch xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/list_divider_qntm_alpha" + android:tint="@color/control_normal_foreground_quantum_dark" /> diff --git a/core/res/res/drawable/list_divider_quantum_light.xml b/core/res/res/drawable/list_divider_quantum_light.xml new file mode 100644 index 000000000000..d312e2d05d75 --- /dev/null +++ b/core/res/res/drawable/list_divider_quantum_light.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> + +<nine-patch xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/list_divider_qntm_alpha" + android:tint="@color/control_normal_foreground_quantum_light" /> diff --git a/core/res/res/drawable/list_section_divider_quantum_dark.xml b/core/res/res/drawable/list_section_divider_quantum_dark.xml new file mode 100644 index 000000000000..6344c7eee634 --- /dev/null +++ b/core/res/res/drawable/list_section_divider_quantum_dark.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> + +<nine-patch xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/list_section_divider_qntm_alpha" + android:tint="@color/control_normal_foreground_quantum_dark" /> diff --git a/core/res/res/drawable/list_section_divider_quantum_light.xml b/core/res/res/drawable/list_section_divider_quantum_light.xml new file mode 100644 index 000000000000..98ede3878000 --- /dev/null +++ b/core/res/res/drawable/list_section_divider_quantum_light.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> + +<nine-patch xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/list_section_divider_qntm_alpha" + android:tint="@color/control_normal_foreground_quantum_light" /> diff --git a/core/res/res/drawable/scrollbar_handle_quantum_dark.xml b/core/res/res/drawable/scrollbar_handle_quantum_dark.xml new file mode 100644 index 000000000000..2d4e37dcb422 --- /dev/null +++ b/core/res/res/drawable/scrollbar_handle_quantum_dark.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> + +<nine-patch xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/scrollbar_handle_qntm_alpha" + android:tint="@color/control_normal_foreground_quantum_dark" /> diff --git a/core/res/res/drawable/scrollbar_handle_quantum_light.xml b/core/res/res/drawable/scrollbar_handle_quantum_light.xml new file mode 100644 index 000000000000..d4d4b8d4390a --- /dev/null +++ b/core/res/res/drawable/scrollbar_handle_quantum_light.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> + +<nine-patch xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/scrollbar_handle_qntm_alpha" + android:tint="@color/control_normal_foreground_quantum_light" /> diff --git a/core/res/res/drawable/text_cursor_quantum_dark.xml b/core/res/res/drawable/text_cursor_quantum_dark.xml new file mode 100644 index 000000000000..bd0d66fd2174 --- /dev/null +++ b/core/res/res/drawable/text_cursor_quantum_dark.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> + +<nine-patch xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/text_cursor_qntm_alpha" + android:tint="@color/control_activated_foreground_quantum_dark" /> diff --git a/core/res/res/drawable/text_cursor_quantum_light.xml b/core/res/res/drawable/text_cursor_quantum_light.xml new file mode 100644 index 000000000000..0ec7f01d3f94 --- /dev/null +++ b/core/res/res/drawable/text_cursor_quantum_light.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> + +<nine-patch xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/text_cursor_qntm_alpha" + android:tint="@color/control_activated_foreground_quantum_light" /> diff --git a/core/res/res/layout/screen_action_bar.xml b/core/res/res/layout/screen_action_bar.xml index 7b9a20bd49fd..326573674440 100644 --- a/core/res/res/layout/screen_action_bar.xml +++ b/core/res/res/layout/screen_action_bar.xml @@ -23,7 +23,8 @@ This is an optimized layout for a screen with the Action Bar enabled. android:id="@+id/action_bar_overlay_layout" android:layout_width="match_parent" android:layout_height="match_parent" - android:splitMotionEvents="false"> + android:splitMotionEvents="false" + android:theme="?attr/actionBarTheme"> <FrameLayout android:id="@android:id/content" android:layout_width="match_parent" android:layout_height="match_parent" /> diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 42fa1061fb78..039bd0763e74 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -673,6 +673,8 @@ <!-- Action bar styles --> <!-- =================== --> <eat-comment /> + <!-- Theme override for the Action Bar --> + <attr name="actionBarTheme" format="reference" /> <!-- Default style for tabs within an action bar --> <attr name="actionBarTabStyle" format="reference" /> <attr name="actionBarTabBarStyle" format="reference" /> diff --git a/core/res/res/values/colors_quantum.xml b/core/res/res/values/colors_quantum.xml index b623263b5497..c8083f49d7e7 100644 --- a/core/res/res/values/colors_quantum.xml +++ b/core/res/res/values/colors_quantum.xml @@ -15,34 +15,150 @@ --> <resources> - <color name="background_quantum_dark">#ff000000</color> - <color name="background_quantum_light">#fff3f3f3</color> + <color name="background_quantum_dark">@color/black</color> + <color name="background_quantum_light">@color/quantum_grey_50</color> + <color name="secondary_background_quantum_dark">@color/quantum_grey_700</color> + <color name="secondary_background_quantum_light">@color/quantum_grey_100</color> <color name="bright_foreground_quantum_dark">@color/background_quantum_light</color> <color name="bright_foreground_quantum_light">@color/background_quantum_dark</color> - <color name="bright_foreground_disabled_quantum_dark">#ff4c4c4c</color> - <color name="bright_foreground_disabled_quantum_light">#ffb2b2b2</color> + <!-- TODO: This is 50% alpha black --> + <color name="bright_foreground_disabled_quantum_dark">#80000000</color> + <!-- TODO: This is 50% alpha grey_50 --> + <color name="bright_foreground_disabled_quantum_light">#80fafafa</color> <color name="bright_foreground_inverse_quantum_dark">@color/bright_foreground_quantum_light</color> <color name="bright_foreground_inverse_quantum_light">@color/bright_foreground_quantum_dark</color> - <color name="dim_foreground_quantum_dark">#bebebe</color> - <color name="dim_foreground_quantum_light">#323232</color> + <color name="dim_foreground_quantum_dark">#ffbebebe</color> + <color name="dim_foreground_quantum_light">#ff323232</color> <color name="dim_foreground_disabled_quantum_dark">#80bebebe</color> <color name="dim_foreground_disabled_quantum_light">#80323232</color> - <color name="hint_foreground_quantum_dark">#808080</color> - <color name="hint_foreground_quantum_light">#808080</color> - <color name="highlighted_text_quantum_dark">#6633b5e5</color> - <color name="highlighted_text_quantum_light">#6633b5e5</color> - - <color name="timepicker_default_background_quantum_dark">#ff303030</color> - <color name="timepicker_default_background_quantum_light">@color/white</color> - <color name="timepicker_default_text_color_quantum_dark">@color/white</color> - <color name="timepicker_default_text_color_quantum_light">#8c8c8c</color> - <color name="timepicker_default_disabled_color_quantum_dark">#7f08c8c8</color> - <color name="timepicker_default_disabled_color_quantum_light">#7f000000</color> - <color name="timepicker_default_ampm_selected_background_color_quantum_dark">@color/holo_blue_light</color> - <color name="timepicker_default_ampm_selected_background_color_quantum_light">@color/holo_blue_light</color> + <!-- TODO: These should be theme attributes. --> + <color name="control_normal_foreground_quantum_light">@color/secondary_text_quantum_light</color> + <color name="control_activated_foreground_quantum_light">@color/quantum_teal_700</color> + + <!-- TODO: These should be theme attributes. --> + <color name="control_normal_foreground_quantum_dark">@color/secondary_text_quantum_dark</color> + <color name="control_activated_foreground_quantum_dark">@color/quantum_lime_A200</color> + + <!-- TODO: These should be theme attributes. --> + <color name="btn_default_normal_quantum_light">@color/quantum_grey_300</color> + <color name="btn_default_pressed_quantum_light">@color/quantum_grey_500</color> + + <!-- TODO: These should be theme attributes. --> + <color name="btn_default_normal_quantum_dark">@color/quantum_grey_700</color> + <color name="btn_default_pressed_quantum_dark">@color/quantum_grey_500</color> + + <color name="hint_foreground_quantum_dark">@color/bright_foreground_disabled_quantum_dark</color> + <color name="hint_foreground_quantum_light">@color/bright_foreground_disabled_quantum_light</color> + <!-- TODO: This is 40% alpha lime_A200 --> + <color name="highlighted_text_quantum_dark">#66eeff41</color> + <!-- TODO: This is 40% alpha teal_700 --> + <color name="highlighted_text_quantum_light">#660097a7</color> + + <!-- TODO: These should all be pushed into a TimePicker widget style. --> + <color name="timepicker_default_background_quantum_dark">@color/background_quantum_dark</color> + <color name="timepicker_default_background_quantum_light">@color/background_quantum_light</color> + <color name="timepicker_default_text_color_quantum_dark">@color/bright_foreground_quantum_dark</color> + <color name="timepicker_default_text_color_quantum_light">@color/bright_foreground_quantum_light</color> + <color name="timepicker_default_disabled_color_quantum_dark">@color/bright_foreground_disabled_quantum_dark</color> + <color name="timepicker_default_disabled_color_quantum_light">@color/bright_foreground_disabled_quantum_light</color> + <color name="timepicker_default_ampm_selected_background_color_quantum_dark">@color/control_activated_foreground_quantum_dark</color> + <color name="timepicker_default_ampm_selected_background_color_quantum_light">@color/control_activated_foreground_quantum_light</color> <color name="timepicker_default_ampm_unselected_background_color_quantum_dark">@color/transparent</color> <color name="timepicker_default_ampm_unselected_background_color_quantum_light">@color/white</color> + + <!-- Primary & accent colors --> + + <color name="quantum_red_100">#fff4c7c3</color> + <color name="quantum_red_300">#ffe67c73</color> + <color name="quantum_red_500">#ffdb4437</color> + <color name="quantum_red_700">#ffc53929</color> + <color name="quantum_red_A200">#ffff5252</color> + <color name="quantum_red_A400">#ffff1744</color> + + <color name="quantum_blue_100">#ffc6dafc</color> + <color name="quantum_blue_300">#ff7baaf7</color> + <color name="quantum_blue_500">#ff4285f4</color> + <color name="quantum_blue_700">#ff3367d6</color> + <color name="quantum_blue_A200">#ff448aff</color> + <color name="quantum_blue_A400">#ff2979ff</color> + + <color name="quantum_teal_100">#ffb2ebf2</color> + <color name="quantum_teal_300">#ff4dd0e1</color> + <color name="quantum_teal_500">#ff00bcd4</color> + <color name="quantum_teal_700">#ff0097a7</color> + <color name="quantum_teal_A200">#ff18ffff</color> + <color name="quantum_teal_A400">#ff00e5ff</color> + + <color name="quantum_green_100">#ffb7e1cd</color> + <color name="quantum_green_300">#ff57bb8a</color> + <color name="quantum_green_500">#ff0f9d58</color> + <color name="quantum_green_700">#ff0b8043</color> + <color name="quantum_green_A200">#ff69f0ae</color> + <color name="quantum_green_A400">#ff00e676</color> + + <color name="quantum_lime_100">#fff0f4c3</color> + <color name="quantum_lime_300">#ffdce775</color> + <color name="quantum_lime_500">#ffcddc39</color> + <color name="quantum_lime_700">#ffafb42b</color> + <color name="quantum_lime_A200">#ffeeff41</color> + <color name="quantum_lime_A400">#ffc6ff00</color> + + <color name="quantum_yellow_100">#fffce8b2</color> + <color name="quantum_yellow_300">#fff7cb4d</color> + <color name="quantum_yellow_500">#fff4b400</color> + <color name="quantum_yellow_700">#fff09300</color> + <color name="quantum_yellow_A200">#ffffcd40</color> + <color name="quantum_yellow_A400">#ffffbc00</color> + + <color name="quantum_orange_100">#ffffe0b2</color> + <color name="quantum_orange_300">#ffffb74d</color> + <color name="quantum_orange_500">#ffff9800</color> + <color name="quantum_orange_700">#fff57c00</color> + <color name="quantum_orange_A200">#ffffab40</color> + <color name="quantum_orange_A400">#ffff9100</color> + + <color name="quantum_deep_orange_100">#fff4c7c3</color> + <color name="quantum_deep_orange_300">#ffe67c73</color> + <color name="quantum_deep_orange_500">#ffff5722</color> + <color name="quantum_deep_orange_700">#ffc53929</color> + <color name="quantum_deep_orange_A200">#ffff5252</color> + <color name="quantum_deep_orange_A400">#ffff1744</color> + + <!-- Neutral colors --> + + <color name="quantum_grey_50">#fffafafa</color> + <color name="quantum_grey_100">#fff5f5f5</color> + <color name="quantum_grey_300">#ffeeeeee</color> + <color name="quantum_grey_500">#ffa3a3a3</color> + <color name="quantum_grey_700">#ff717171</color> + + <color name="quantum_blue_grey_50">#ffeceff1</color> + <color name="quantum_blue_grey_100">#ffcfd8dc</color> + <color name="quantum_blue_grey_300">#ff90a4ae</color> + <color name="quantum_blue_grey_500">#ff607d8b</color> + <color name="quantum_blue_grey_700">#ff455a64</color> + + <color name="quantum_brown_100">#ffd7ccc8</color> + <color name="quantum_brown_300">#ffa1887f</color> + <color name="quantum_brown_500">#ff795548</color> + <color name="quantum_brown_700">#ff5d4037</color> + + <!-- Text & foreground colors --> + + <color name="primary_text_quantum_light">#ff000000</color> + <color name="secondary_text_quantum_light">#de000000</color> + <color name="tertiary_text_quantum_light">#8a000000</color> + + <color name="primary_text_quantum_dark">#ffffffff</color> + <color name="secondary_text_quantum_dark">#deffffff</color> + <color name="tertiary_text_quantum_dark">#8affffff</color> + + <!-- "Theme" colors to be replaced by attrs when available --> + <color name="theme_color_100">@color/quantum_teal_100</color> + <color name="theme_color_300">@color/quantum_teal_300</color> + <color name="theme_color_500">@color/quantum_teal_500</color> + <color name="theme_color_700">@color/quantum_teal_700</color> </resources> diff --git a/core/res/res/values/dimens_quantum.xml b/core/res/res/values/dimens_quantum.xml new file mode 100644 index 000000000000..39137526ae5c --- /dev/null +++ b/core/res/res/values/dimens_quantum.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> +<resources> + + <!-- Default height of an action bar. --> + <dimen name="action_bar_default_height_quantum">56dp</dimen> + <!-- Vertical padding around action bar icons. --> + <dimen name="action_bar_icon_vertical_padding_quantum">16dp</dimen> + <!-- Text size for action bar titles --> + <dimen name="action_bar_title_text_size_quantum">20sp</dimen> + <!-- Text size for action bar subtitles --> + <dimen name="action_bar_subtitle_text_size_quantum">16sp</dimen> + <!-- Top margin for action bar subtitles --> + <dimen name="action_bar_subtitle_top_margin_quantum">-3dp</dimen> + <!-- Bottom margin for action bar subtitles --> + <dimen name="action_bar_subtitle_bottom_margin_quantum">5dp</dimen> + + <dimen name="text_size_display_4_quantum">112sp</dimen> + <dimen name="text_size_display_3_quantum">56sp</dimen> + <dimen name="text_size_display_2_quantum">45sp</dimen> + <dimen name="text_size_display_1_quantum">34sp</dimen> + <dimen name="text_size_headline_quantum">24sp</dimen> + <dimen name="text_size_title_quantum">20sp</dimen> + <dimen name="text_size_subhead_quantum">16sp</dimen> + <dimen name="text_size_body_2_quantum">14sp</dimen> + <dimen name="text_size_body_1_quantum">14sp</dimen> + <dimen name="text_size_caption_quantum">12sp</dimen> + <dimen name="text_size_menu_quantum">14sp</dimen> + <dimen name="text_size_button_quantum">14sp</dimen> + +</resources> diff --git a/core/res/res/values/donottranslate_quantum.xml b/core/res/res/values/donottranslate_quantum.xml new file mode 100644 index 000000000000..83cc4e545f29 --- /dev/null +++ b/core/res/res/values/donottranslate_quantum.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> + +<resources> + + <string name="font_family_display_4_quantum">sans-serif-light</string> + <string name="font_family_display_3_quantum">sans-serif</string> + <string name="font_family_display_2_quantum">sans-serif</string> + <string name="font_family_display_1_quantum">sans-serif</string> + <string name="font_family_headline_quantum">sans-serif</string> + <string name="font_family_title_quantum">sans-serif-medium</string> + <string name="font_family_subhead_quantum">sans-serif</string> + <string name="font_family_body_2_quantum">sans-serif-medium</string> + <string name="font_family_body_1_quantum">sans-serif</string> + <string name="font_family_caption_quantum">sans-serif</string> + <string name="font_family_menu_quantum">sans-serif-medium</string> + <string name="font_family_button_quantum">sans-serif</string> + +</resources> diff --git a/core/res/res/values/styles_quantum.xml b/core/res/res/values/styles_quantum.xml index df850a7830f4..949ead4608b0 100644 --- a/core/res/res/values/styles_quantum.xml +++ b/core/res/res/values/styles_quantum.xml @@ -88,47 +88,48 @@ please see styles_device_defaults.xml. <!-- Begin Quantum theme styles --> - <!-- Text Styles --> + <!-- Text styles --> + <style name="TextAppearance.Quantum" parent="TextAppearance"/> <style name="TextAppearance.Quantum.Inverse" parent="TextAppearance.Inverse"> - <item name="textColor">?textColorPrimaryInverse</item> - <item name="textColorHint">?textColorHintInverse</item> - <item name="textColorHighlight">?textColorHighlightInverse</item> - <item name="textColorLink">?textColorLinkInverse</item> + <item name="textColor">?attr/textColorPrimaryInverse</item> + <item name="textColorHint">?attr/textColorHintInverse</item> + <item name="textColorHighlight">?attr/textColorHighlightInverse</item> + <item name="textColorLink">?attr/textColorLinkInverse</item> </style> <style name="TextAppearance.Quantum.Large" parent="TextAppearance.Large"/> - <style name="TextAppearance.Quantum.Medium" parent="TextAppearance.Medium"/> - - <style name="TextAppearance.Quantum.Small" parent="TextAppearance.Small"/> - <style name="TextAppearance.Quantum.Large.Inverse"> - <item name="textColor">?textColorPrimaryInverse</item> - <item name="textColorHint">?textColorHintInverse</item> - <item name="textColorHighlight">?textColorHighlightInverse</item> - <item name="textColorLink">?textColorLinkInverse</item> + <item name="textColor">?attr/textColorPrimaryInverse</item> + <item name="textColorHint">?attr/textColorHintInverse</item> + <item name="textColorHighlight">?attr/textColorHighlightInverse</item> + <item name="textColorLink">?attr/textColorLinkInverse</item> </style> + <style name="TextAppearance.Quantum.Medium" parent="TextAppearance.Medium"/> + <style name="TextAppearance.Quantum.Medium.Inverse"> - <item name="textColor">?textColorPrimaryInverse</item> - <item name="textColorHint">?textColorHintInverse</item> - <item name="textColorHighlight">?textColorHighlightInverse</item> - <item name="textColorLink">?textColorLinkInverse</item> + <item name="textColor">?attr/textColorSecondaryInverse</item> + <item name="textColorHint">?attr/textColorHintInverse</item> + <item name="textColorHighlight">?attr/textColorHighlightInverse</item> + <item name="textColorLink">?attr/textColorLinkInverse</item> </style> + <style name="TextAppearance.Quantum.Small" parent="TextAppearance.Small"/> + <style name="TextAppearance.Quantum.Small.Inverse"> - <item name="textColor">?textColorSecondaryInverse</item> - <item name="textColorHint">?textColorHintInverse</item> - <item name="textColorHighlight">?textColorHighlightInverse</item> - <item name="textColorLink">?textColorLinkInverse</item> + <item name="textColor">?attr/textColorSecondaryInverse</item> + <item name="textColorHint">?attr/textColorHintInverse</item> + <item name="textColorHighlight">?attr/textColorHighlightInverse</item> + <item name="textColorLink">?attr/textColorLinkInverse</item> </style> <style name="TextAppearance.Quantum.SearchResult"> <item name="textStyle">normal</item> - <item name="textColor">?textColorPrimary</item> - <item name="textColorHint">?textColorHint</item> + <item name="textColor">?attr/textColorPrimary</item> + <item name="textColorHint">?attr/textColorHint</item> </style> <style name="TextAppearance.Quantum.SearchResult.Title"> @@ -137,17 +138,46 @@ please see styles_device_defaults.xml. <style name="TextAppearance.Quantum.SearchResult.Subtitle"> <item name="textSize">14sp</item> - <item name="textColor">?textColorSecondary</item> + <item name="textColor">?attr/textColorSecondary</item> </style> <style name="TextAppearance.Quantum.Widget" parent="TextAppearance.Widget"/> - <style name="TextAppearance.Quantum.Widget.Button" parent="TextAppearance.Quantum.Small.Inverse"> - <item name="textColor">@color/primary_text_light_nodisable</item> + <style name="TextAppearance.Quantum.Widget.Button"> + <item name="fontFamily">@string/font_family_button_quantum</item> + <item name="textSize">@dimen/text_size_button_quantum</item> + <item name="textAllCaps">true</item> + <item name="textColor">?attr/textColorPrimary</item> + <item name="textStyle">normal</item> + </style> + + <style name="TextAppearance.Quantum.Widget.EditText"> + <item name="textColor">?textColorPrimaryInverse</item> + <item name="textColorHint">?textColorHintInverse</item> + </style> + + <style name="TextAppearance.Quantum.Widget.Switch" parent="TextAppearance.Quantum.Small"> + <item name="textColor">@color/secondary_text_quantum_dark</item> </style> + <style name="TextAppearance.Quantum.Widget.PopupMenu" parent="TextAppearance.Widget.PopupMenu"> + <item name="textColor">?attr/textColorPrimary</item> + </style> + + <style name="TextAppearance.Quantum.Widget.PopupMenu.Large"> + <item name="textSize">18sp</item> + </style> + + <style name="TextAppearance.Quantum.Widget.PopupMenu.Small"> + <item name="textSize">14sp</item> + </style> + + <style name="TextAppearance.Quantum.Widget.DropDownHint"> + <item name="textColor">?attr/textColorPrimary</item> + <item name="textSize">14sp</item> + </style> <style name="TextAppearance.Quantum.Widget.IconMenu.Item" parent="TextAppearance.Quantum.Small"> - <item name="textColor">?textColorPrimary</item> + <item name="textColor">?attr/textColorPrimary</item> </style> <!-- This style is for smaller screens; values-xlarge defines a version @@ -159,115 +189,72 @@ please see styles_device_defaults.xml. </style> <style name="TextAppearance.Quantum.Widget.TextView"> - <item name="textColor">?textColorPrimaryDisableOnly</item> - <item name="textColorHint">?textColorHint</item> + <item name="textColor">?attr/textColorPrimaryDisableOnly</item> + <item name="textColorHint">?attr/textColorHint</item> </style> <style name="TextAppearance.Quantum.Widget.TextView.PopupMenu"> <item name="textSize">18sp</item> - <item name="textColor">?textColorPrimaryDisableOnly</item> - <item name="textColorHint">?textColorHint</item> </style> - <style name="TextAppearance.Quantum.Widget.DropDownHint"> - <item name="textColor">?textColorPrimary</item> - <item name="textSize">14sp</item> - </style> + <style name="TextAppearance.Quantum.Widget.TextView.SpinnerItem" /> <style name="TextAppearance.Quantum.Widget.DropDownItem"> - <item name="textColor">?textColorPrimaryDisableOnly</item> + <item name="textColor">?attr/textColorPrimaryDisableOnly</item> </style> - <style name="TextAppearance.Quantum.Widget.TextView.SpinnerItem"> - <item name="textColor">?textColorPrimaryDisableOnly</item> - </style> - - <style name="TextAppearance.Quantum.Widget.EditText"> - <item name="textColor">@color/bright_foreground_light</item> - <item name="textColorHint">@color/hint_foreground_quantum_light</item> - </style> + <style name="TextAppearance.Quantum.Widget.ActionMode"/> - <style name="TextAppearance.Quantum.Widget.PopupMenu" parent="TextAppearance.Widget.PopupMenu"> - <item name="textColor">?attr/textColorPrimary</item> + <style name="TextAppearance.Quantum.Widget.ActionMode.Title" parent="TextAppearance.Quantum.Medium"> + <item name="textSize">@dimen/action_bar_title_text_size_quantum</item> </style> - <style name="TextAppearance.Quantum.Widget.PopupMenu.Large"> - <item name="textSize">18sp</item> + <style name="TextAppearance.Quantum.Widget.ActionMode.Subtitle" parent="TextAppearance.Quantum.Small"> + <item name="textSize">@dimen/action_bar_subtitle_text_size_quantum</item> </style> - <style name="TextAppearance.Quantum.Widget.PopupMenu.Small"> - <item name="textSize">14sp</item> - </style> + <!-- Text styles with no light versions --> - <style name="TextAppearance.Quantum.Widget.ActionBar.Title" - parent="TextAppearance.Quantum.Medium"> - <item name="textSize">@dimen/action_bar_title_text_size</item> + <style name="TextAppearance.Quantum.Widget.ActionBar.Title" parent="TextAppearance.Quantum.Medium"> + <item name="textSize">@dimen/action_bar_title_text_size_quantum</item> </style> - <style name="TextAppearance.Quantum.Widget.ActionBar.Subtitle" - parent="TextAppearance.Quantum.Small"> - <item name="textSize">@dimen/action_bar_subtitle_text_size</item> + <style name="TextAppearance.Quantum.Widget.ActionBar.Subtitle" parent="TextAppearance.Quantum.Small"> + <item name="textSize">@dimen/action_bar_subtitle_text_size_quantum</item> </style> - <style name="TextAppearance.Quantum.Widget.ActionBar.Title.Inverse" - parent="TextAppearance.Quantum.Medium.Inverse"> - <item name="textSize">@dimen/action_bar_title_text_size</item> + <style name="TextAppearance.Quantum.Widget.ActionBar.Title.Inverse" parent="TextAppearance.Quantum.Medium.Inverse"> + <item name="textSize">@dimen/action_bar_title_text_size_quantum</item> </style> - <style name="TextAppearance.Quantum.Widget.ActionBar.Subtitle.Inverse" - parent="TextAppearance.Quantum.Small.Inverse"> - <item name="textSize">@dimen/action_bar_subtitle_text_size</item> + <style name="TextAppearance.Quantum.Widget.ActionBar.Subtitle.Inverse" parent="TextAppearance.Quantum.Small.Inverse"> + <item name="textSize">@dimen/action_bar_subtitle_text_size_quantum</item> </style> - <style name="TextAppearance.Quantum.Widget.ActionBar.Menu" - parent="TextAppearance.Quantum.Small"> + <style name="TextAppearance.Quantum.Widget.ActionBar.Menu" parent="TextAppearance.Quantum.Small"> <item name="textSize">12sp</item> <item name="textStyle">bold</item> <item name="textColor">?attr/actionMenuTextColor</item> <item name="textAllCaps">@bool/config_actionMenuItemAllCaps</item> </style> - <style name="TextAppearance.Quantum.Widget.ActionMode"/> - - <style name="TextAppearance.Quantum.Widget.ActionMode.Title" - parent="TextAppearance.Quantum.Medium"> - <item name="textSize">@dimen/action_bar_title_text_size</item> - </style> - - <style name="TextAppearance.Quantum.Widget.ActionMode.Subtitle" - parent="TextAppearance.Quantum.Small"> - <item name="textSize">@dimen/action_bar_subtitle_text_size</item> - </style> - - <style name="TextAppearance.Quantum.Widget.ActionMode.Title.Inverse" - parent="TextAppearance.Quantum.Medium.Inverse"> - <item name="textSize">@dimen/action_bar_title_text_size</item> - </style> - - <style name="TextAppearance.Quantum.Widget.ActionMode.Subtitle.Inverse" - parent="TextAppearance.Quantum.Small.Inverse"> - <item name="textSize">@dimen/action_bar_subtitle_text_size</item> - </style> - - <style name="TextAppearance.Quantum.Widget.Switch" parent="TextAppearance.Quantum.Small"> - <!-- Switch thumb asset presents a dark background. --> - <item name="textColor">@color/secondary_text_quantum_dark</item> + <style name="TextAppearance.Quantum.Widget.ActionMode.Title.Inverse" parent="TextAppearance.Quantum.Medium.Inverse"> + <item name="textSize">@dimen/action_bar_title_text_size_quantum</item> </style> - <style name="TextAppearance.Quantum.Light.Widget.Switch" parent="TextAppearance.Quantum.Small"> - <!-- Switch thumb asset presents a dark background. --> - <item name="textColor">@color/primary_text_quantum_dark</item> + <style name="TextAppearance.Quantum.Widget.ActionMode.Subtitle.Inverse" parent="TextAppearance.Quantum.Small.Inverse"> + <item name="textSize">@dimen/action_bar_subtitle_text_size_quantum</item> </style> <style name="TextAppearance.Quantum.WindowTitle"> - <item name="textColor">#fff</item> + <item name="textColor">?attr/textColorPrimary</item> <item name="textSize">14sp</item> <item name="textStyle">bold</item> </style> <style name="TextAppearance.Quantum.DialogWindowTitle"> <item name="textSize">22sp</item> - <item name="textColor">@color/holo_blue_light</item> + <item name="textColor">?attr/textColorPrimary</item> </style> <style name="TextAppearance.Quantum.CalendarViewWeekDayView" parent="TextAppearance.Small.CalendarViewWeekDayView"> @@ -277,12 +264,7 @@ please see styles_device_defaults.xml. <!-- Light text styles --> <style name="TextAppearance.Quantum.Light" parent="TextAppearance.Quantum"/> - <style name="TextAppearance.Quantum.Light.Inverse"> - <item name="textColor">?textColorPrimaryInverse</item> - <item name="textColorHint">?textColorHintInverse</item> - <item name="textColorHighlight">?textColorHighlightInverse</item> - <item name="textColorLink">?textColorLinkInverse</item> - </style> + <style name="TextAppearance.Quantum.Light.Inverse" parent="TextAppearance.Quantum.Inverse" /> <style name="TextAppearance.Quantum.Light.Large" parent="TextAppearance.Quantum.Large"/> @@ -290,48 +272,26 @@ please see styles_device_defaults.xml. <style name="TextAppearance.Quantum.Light.Small" parent="TextAppearance.Quantum.Small"/> - <style name="TextAppearance.Quantum.Light.Large.Inverse"> - <item name="textColor">?textColorPrimaryInverse</item> - <item name="textColorHint">?textColorHintInverse</item> - <item name="textColorHighlight">?textColorHighlightInverse</item> - <item name="textColorLink">?textColorLinkInverse</item> - </style> + <style name="TextAppearance.Quantum.Light.Large.Inverse" parent="TextAppearance.Quantum.Large.Inverse" /> - <style name="TextAppearance.Quantum.Light.Medium.Inverse"> - <item name="textColor">?textColorPrimaryInverse</item> - <item name="textColorHint">?textColorHintInverse</item> - <item name="textColorHighlight">?textColorHighlightInverse</item> - <item name="textColorLink">?textColorLinkInverse</item> - </style> + <style name="TextAppearance.Quantum.Light.Medium.Inverse" parent="TextAppearance.Quantum.Medium.Inverse" /> - <style name="TextAppearance.Quantum.Light.Small.Inverse"> - <item name="textColor">?textColorPrimaryInverse</item> - <item name="textColorHint">?textColorHintInverse</item> - <item name="textColorHighlight">?textColorHighlightInverse</item> - <item name="textColorLink">?textColorLinkInverse</item> - </style> + <style name="TextAppearance.Quantum.Light.Small.Inverse" parent="TextAppearance.Quantum.Small.Inverse" /> - <style name="TextAppearance.Quantum.Light.SearchResult" parent="TextAppearance.Quantum.SearchResult"> - <item name="textColor">?textColorPrimary</item> - <item name="textColorHint">?textColorHint</item> - </style> + <style name="TextAppearance.Quantum.Light.SearchResult" parent="TextAppearance.Quantum.SearchResult" /> - <style name="TextAppearance.Quantum.Light.SearchResult.Title"> - <item name="textSize">18sp</item> - </style> + <style name="TextAppearance.Quantum.Light.SearchResult.Title" parent="TextAppearance.Quantum.SearchResult.Title" /> - <style name="TextAppearance.Quantum.Light.SearchResult.Subtitle"> - <item name="textSize">14sp</item> - <item name="textColor">?textColorSecondary</item> - </style> + <style name="TextAppearance.Quantum.Light.SearchResult.Subtitle" parent="TextAppearance.Quantum.SearchResult.Subtitle" /> <style name="TextAppearance.Quantum.Light.Widget" parent="TextAppearance.Widget"/> - <style name="TextAppearance.Quantum.Light.Widget.Button"/> + <style name="TextAppearance.Quantum.Light.Widget.Button" parent="TextAppearance.Quantum.Widget.Button" /> - <style name="TextAppearance.Quantum.Light.Widget.EditText"> - <item name="textColor">@color/bright_foreground_dark</item> - <item name="textColorHint">@color/hint_foreground_quantum_dark</item> + <style name="TextAppearance.Quantum.Light.Widget.EditText" parent="TextAppearance.Quantum.Widget.EditText" /> + + <style name="TextAppearance.Quantum.Light.Widget.Switch" parent="TextAppearance.Quantum.Small"> + <item name="textColor">@color/secondary_text_quantum_dark</item> </style> <style name="TextAppearance.Quantum.Light.Widget.PopupMenu" parent="TextAppearance.Quantum.Widget.PopupMenu"/> @@ -346,57 +306,59 @@ please see styles_device_defaults.xml. <style name="TextAppearance.Quantum.Light.Widget.ActionMode.Subtitle" parent="TextAppearance.Widget.ActionMode.Subtitle"/> - <style name="TextAppearance.Quantum.Light.WindowTitle"> - <item name="textColor">#fff</item> - <item name="textSize">14sp</item> - <item name="textStyle">bold</item> - </style> + <style name="TextAppearance.Quantum.Light.WindowTitle" parent="TextAppearance.Quantum.WindowTitle" /> - <style name="TextAppearance.Quantum.Light.DialogWindowTitle"> - <item name="textSize">22sp</item> - <item name="textColor">@color/holo_blue_light</item> - </style> + <style name="TextAppearance.Quantum.Light.DialogWindowTitle" parent="TextAppearance.Quantum.DialogWindowTitle" /> <style name="TextAppearance.Quantum.Light.CalendarViewWeekDayView" parent="TextAppearance.Small.CalendarViewWeekDayView"/> <!-- Widget Styles --> - <style name="Widget.Quantum" parent="Widget"/> <style name="Quantum" /> <style name="Quantum.Light" /> + <style name="Widget.Quantum" parent="Widget" /> + + <!-- Bordered ink button --> <style name="Widget.Quantum.Button" parent="Widget.Button"> <item name="background">@drawable/btn_default_quantum_dark</item> - <item name="textAppearance">?attr/textAppearanceMedium</item> - <item name="textColor">@color/primary_text_quantum_dark</item> + <item name="textAppearance">?attr/textAppearanceButton</item> <item name="minHeight">48dip</item> - <item name="minWidth">64dip</item> + <item name="minWidth">96dip</item> </style> - <style name="Widget.Quantum.StackView"> - <item name="resOutColor">@color/holo_blue_light</item> - <item name="clickColor">@color/holo_blue_light</item> + <!-- Small bordered ink button --> + <style name="Widget.Quantum.Button.Small"> + <item name="minHeight">48dip</item> + <item name="minWidth">48dip</item> </style> - <style name="Widget.Quantum.Button.Borderless"> - <item name="background">?attr/selectableItemBackground</item> - <item name="paddingStart">4dip</item> - <item name="paddingEnd">4dip</item> + <!-- Bordered paper button --> + <style name="Widget.Quantum.Button.Paper"> + <!-- TODO: Specify pressed state animation. --> </style> - <style name="Widget.Quantum.Button.Borderless.Small"> - <item name="textSize">14sp</item> + <!-- Bordered paper button with color --> + <style name="Widget.Quantum.Button.Paper.Color"> + <item name="background">@drawable/btn_color_quantum_dark</item> </style> - <style name="Widget.Quantum.Button.Small"> - <item name="background">@drawable/btn_default_quantum_dark</item> - <item name="textAppearance">?attr/textAppearanceSmall</item> - <item name="textColor">@color/primary_text_quantum_dark</item> + <!-- Borderless ink button --> + <style name="Widget.Quantum.Button.Borderless"> + <item name="background">@drawable/btn_borderless_quantum_dark</item> + </style> + + <!-- Small borderless ink button --> + <style name="Widget.Quantum.Button.Borderless.Small"> <item name="minHeight">48dip</item> <item name="minWidth">48dip</item> </style> + <!-- Borderless paper button --> + <style name="Widget.Quantum.Button.Borderless.Paper"> + <!-- TODO: Specify pressed state animation. --> + </style> <style name="Widget.Quantum.Button.Inset"> <item name="background">@drawable/button_inset</item> </style> @@ -405,7 +367,6 @@ please see styles_device_defaults.xml. <item name="background">@drawable/btn_toggle_holo_dark</item> <item name="textOn">@string/capital_on</item> <item name="textOff">@string/capital_off</item> - <item name="disabledAlpha">?attr/disabledAlpha</item> <item name="textAppearance">?attr/textAppearanceSmall</item> <item name="minHeight">48dip</item> </style> @@ -430,12 +391,17 @@ please see styles_device_defaults.xml. <item name="dividerPadding">0dp</item> </style> + <style name="Widget.Quantum.StackView"> + <item name="resOutColor">@color/holo_blue_light</item> + <item name="clickColor">@color/holo_blue_light</item> + </style> + <style name="Widget.Quantum.TextView" parent="Widget.TextView"/> <style name="Widget.Quantum.CheckedTextView" parent="Widget.CheckedTextView"/> <style name="Widget.Quantum.TextView.ListSeparator" parent="Widget.TextView.ListSeparator"> - <item name="background">@drawable/list_section_divider_holo_dark</item> + <item name="background">@drawable/list_section_divider_quantum_dark</item> <item name="textAllCaps">true</item> </style> @@ -447,7 +413,7 @@ please see styles_device_defaults.xml. <style name="Widget.Quantum.AutoCompleteTextView" parent="Widget.AutoCompleteTextView"> <item name="dropDownSelector">@drawable/list_selector_quantum_dark</item> - <item name="popupBackground">@drawable/menu_dropdown_panel_holo_dark</item> + <item name="popupBackground">?attr/colorBackground</item> </style> <style name="Widget.Quantum.CompoundButton" parent="Widget.CompoundButton"/> @@ -609,7 +575,7 @@ please see styles_device_defaults.xml. <style name="Widget.Quantum.Spinner" parent="Widget.Spinner.DropDown"> <item name="background">@drawable/spinner_background_holo_dark</item> <item name="dropDownSelector">@drawable/list_selector_quantum_dark</item> - <item name="popupBackground">@drawable/menu_dropdown_panel_holo_dark</item> + <item name="popupBackground">?attr/colorBackground</item> <item name="dropDownVerticalOffset">0dip</item> <item name="dropDownHorizontalOffset">0dip</item> <item name="dropDownWidth">wrap_content</item> @@ -684,7 +650,7 @@ please see styles_device_defaults.xml. <style name="Widget.Quantum.ListPopupWindow" parent="Widget.ListPopupWindow"> <item name="dropDownSelector">@drawable/list_selector_quantum_dark</item> - <item name="popupBackground">@drawable/menu_panel_holo_dark</item> + <item name="popupBackground">?attr/colorBackground</item> <item name="dropDownVerticalOffset">0dip</item> <item name="dropDownHorizontalOffset">0dip</item> <item name="dropDownWidth">wrap_content</item> @@ -708,7 +674,7 @@ please see styles_device_defaults.xml. </style> <style name="Widget.Quantum.ActionButton.Overflow"> - <item name="src">@drawable/ic_menu_moreoverflow_holo_dark</item> + <item name="src">@drawable/ic_menu_moreoverflow_quantum_dark</item> <item name="background">?attr/actionBarItemBackground</item> <item name="contentDescription">@string/action_menu_overflow_description</item> </style> @@ -749,7 +715,7 @@ please see styles_device_defaults.xml. <style name="Widget.Quantum.ActionBar" parent="Widget.ActionBar"> <item name="titleTextStyle">@style/TextAppearance.Quantum.Widget.ActionBar.Title</item> <item name="subtitleTextStyle">@style/TextAppearance.Quantum.Widget.ActionBar.Subtitle</item> - <item name="background">@drawable/ab_transparent_dark_holo</item> + <item name="background">@drawable/ab_transparent_quantum_dark</item> <item name="backgroundStacked">@drawable/ab_stacked_transparent_dark_holo</item> <item name="backgroundSplit">@drawable/ab_bottom_transparent_dark_holo</item> <item name="divider">?attr/dividerVertical</item> @@ -785,41 +751,53 @@ please see styles_device_defaults.xml. <!-- Light widget styles --> - <style name="Widget.Quantum.Light"/> + <style name="Widget.Quantum.Light" parent="Widget" /> - <style name="Widget.Quantum.Light.Button" parent="Widget.Button"> + <!-- Bordered ink button --> + <style name="Widget.Quantum.Light.Button" parent="Widget.Quantum.Button"> <item name="background">@drawable/btn_default_quantum_light</item> - <item name="textAppearance">?attr/textAppearanceMediumInverse</item> - <item name="textColor">@color/primary_text_quantum_light</item> + <item name="textAppearance">?attr/textAppearanceButton</item> <item name="minHeight">48dip</item> - <item name="minWidth">64dip</item> + <item name="minWidth">96dip</item> </style> - <style name="Widget.Quantum.Light.Button.Borderless"> - <item name="background">?attr/selectableItemBackground</item> - <item name="paddingStart">4dip</item> - <item name="paddingEnd">4dip</item> + <!-- Small bordered ink button --> + <style name="Widget.Quantum.Light.Button.Small"> + <item name="minHeight">48dip</item> + <item name="minWidth">48dip</item> </style> - <style name="Widget.Quantum.Light.Button.Borderless.Small"> - <item name="textSize">14sp</item> + <!-- Bordered paper button --> + <style name="Widget.Quantum.Light.Button.Paper"> + <!-- TODO: Specify pressed state animation. --> </style> - <style name="Widget.Quantum.Light.Button.Small"> - <item name="background">@drawable/btn_default_quantum_light</item> - <item name="textAppearance">?attr/textAppearanceSmall</item> - <item name="textColor">@color/primary_text_quantum_light</item> + <!-- Bordered paper button with color --> + <style name="Widget.Quantum.Light.Button.Paper.Color"> + <item name="background">@drawable/btn_color_quantum_light</item> + </style> + + <!-- Borderless ink button --> + <style name="Widget.Quantum.Light.Button.Borderless"> + <item name="background">@drawable/btn_borderless_quantum_light</item> + </style> + + <!-- Small borderless ink button --> + <style name="Widget.Quantum.Light.Button.Borderless.Small"> <item name="minHeight">48dip</item> <item name="minWidth">48dip</item> </style> + <!-- Borderless paper button --> + <style name="Widget.Quantum.Light.Button.Borderless.Paper"> + <!-- TODO: Specify pressed state animation. --> + </style> <style name="Widget.Quantum.Light.Button.Inset"/> <style name="Widget.Quantum.Light.Button.Toggle"> <item name="background">@drawable/btn_toggle_holo_light</item> <item name="textOn">@string/capital_on</item> <item name="textOff">@string/capital_off</item> - <item name="disabledAlpha">?attr/disabledAlpha</item> <item name="textAppearance">?attr/textAppearanceSmall</item> <item name="minHeight">48dip</item> </style> @@ -840,7 +818,7 @@ please see styles_device_defaults.xml. <style name="Widget.Quantum.Light.CheckedTextView" parent="Widget.CheckedTextView"/> <style name="Widget.Quantum.Light.TextView.ListSeparator" parent="Widget.TextView.ListSeparator"> - <item name="background">@drawable/list_section_divider_holo_light</item> + <item name="background">@drawable/list_section_divider_quantum_light</item> <item name="textAllCaps">true</item> </style> @@ -852,7 +830,7 @@ please see styles_device_defaults.xml. <style name="Widget.Quantum.Light.AutoCompleteTextView" parent="Widget.AutoCompleteTextView"> <item name="dropDownSelector">@drawable/list_selector_quantum_light</item> - <item name="popupBackground">@drawable/menu_dropdown_panel_holo_light</item> + <item name="popupBackground">?attr/colorBackground</item> </style> <style name="Widget.Quantum.Light.CompoundButton.CheckBox" parent="Widget.CompoundButton.CheckBox"/> @@ -978,7 +956,7 @@ please see styles_device_defaults.xml. <style name="Widget.Quantum.Light.Spinner" parent="Widget.Quantum.Spinner"> <item name="background">@drawable/spinner_background_holo_light</item> <item name="dropDownSelector">@drawable/list_selector_quantum_light</item> - <item name="popupBackground">@drawable/menu_dropdown_panel_holo_light</item> + <item name="popupBackground">?attr/colorBackground</item> <item name="dropDownVerticalOffset">0dip</item> <item name="dropDownHorizontalOffset">0dip</item> <item name="dropDownWidth">wrap_content</item> @@ -1023,7 +1001,7 @@ please see styles_device_defaults.xml. <style name="Widget.Quantum.Light.ListPopupWindow" parent="Widget.ListPopupWindow"> <item name="dropDownSelector">@drawable/list_selector_quantum_light</item> - <item name="popupBackground">@drawable/menu_panel_holo_light</item> + <item name="popupBackground">?attr/colorBackground</item> <item name="dropDownVerticalOffset">0dip</item> <item name="dropDownHorizontalOffset">0dip</item> <item name="dropDownWidth">wrap_content</item> @@ -1034,14 +1012,13 @@ please see styles_device_defaults.xml. <style name="Widget.Quantum.Light.ActionButton" parent="Widget.Quantum.ActionButton"/> <style name="Widget.Quantum.Light.ActionButton.Overflow"> - <item name="src">@drawable/ic_menu_moreoverflow_holo_light</item> + <item name="src">@drawable/ic_menu_moreoverflow_quantum_light</item> <item name="contentDescription">@string/action_menu_overflow_description</item> </style> <style name="Widget.Quantum.Light.ActionBar.TabView" parent="Widget.Quantum.ActionBar.TabView"/> <style name="Widget.Quantum.Light.Tab" parent="Widget.Quantum.Light.ActionBar.TabView"> - <item name="background">@drawable/tab_indicator_holo</item> <item name="layout_width">0dip</item> <item name="layout_weight">1</item> <item name="minWidth">80dip</item> @@ -1076,10 +1053,10 @@ please see styles_device_defaults.xml. <style name="Widget.Quantum.Light.ActionBar" parent="Widget.Quantum.ActionBar"> <item name="titleTextStyle">@style/TextAppearance.Quantum.Widget.ActionBar.Title</item> <item name="subtitleTextStyle">@style/TextAppearance.Quantum.Widget.ActionBar.Subtitle</item> - <item name="background">@drawable/ab_transparent_light_holo</item> + <item name="background">@drawable/ab_transparent_quantum_light</item> <item name="backgroundStacked">@drawable/ab_stacked_transparent_light_holo</item> <item name="backgroundSplit">@drawable/ab_bottom_transparent_light_holo</item> - <item name="homeAsUpIndicator">@drawable/ic_ab_back_holo_light</item> + <item name="homeAsUpIndicator">@drawable/ic_ab_back_quantum_light</item> <item name="progressBarStyle">@style/Widget.Quantum.Light.ProgressBar.Horizontal</item> <item name="indeterminateProgressStyle">@style/Widget.Quantum.Light.ProgressBar</item> </style> @@ -1103,7 +1080,7 @@ please see styles_device_defaults.xml. <item name="background">@drawable/ab_solid_dark_holo</item> <item name="backgroundStacked">@drawable/ab_stacked_solid_dark_holo</item> <item name="backgroundSplit">@drawable/ab_bottom_solid_inverse_holo</item> - <item name="divider">@drawable/list_divider_holo_dark</item> + <item name="divider">@drawable/list_divider_quantum_dark</item> <item name="progressBarStyle">@style/Widget.Quantum.ProgressBar.Horizontal</item> <item name="indeterminateProgressStyle">@style/Widget.Quantum.ProgressBar</item> <item name="progressBarPadding">32dip</item> @@ -1132,16 +1109,16 @@ please see styles_device_defaults.xml. <!-- Dialog styles --> <style name="AlertDialog.Quantum" parent="AlertDialog"> - <item name="fullDark">@drawable/dialog_full_holo_dark</item> - <item name="topDark">@drawable/dialog_top_holo_dark</item> - <item name="centerDark">@drawable/dialog_middle_holo_dark</item> - <item name="bottomDark">@drawable/dialog_bottom_holo_dark</item> - <item name="fullBright">@drawable/dialog_full_holo_dark</item> - <item name="topBright">@drawable/dialog_top_holo_dark</item> - <item name="centerBright">@drawable/dialog_middle_holo_dark</item> - <item name="bottomBright">@drawable/dialog_bottom_holo_dark</item> - <item name="bottomMedium">@drawable/dialog_bottom_holo_dark</item> - <item name="centerMedium">@drawable/dialog_middle_holo_dark</item> + <item name="fullDark">?attr/colorBackground</item> + <item name="topDark">?attr/colorBackground</item> + <item name="centerDark">?attr/colorBackground</item> + <item name="bottomDark">?attr/colorBackground</item> + <item name="fullBright">?attr/colorBackground</item> + <item name="topBright">?attr/colorBackground</item> + <item name="centerBright">?attr/colorBackground</item> + <item name="bottomBright">?attr/colorBackground</item> + <item name="bottomMedium">?attr/colorBackground</item> + <item name="centerMedium">?attr/colorBackground</item> <item name="layout">@layout/alert_dialog_holo</item> <item name="listLayout">@layout/select_dialog_holo</item> <item name="progressLayout">@layout/progress_dialog_holo</item> @@ -1151,18 +1128,7 @@ please see styles_device_defaults.xml. <item name="singleChoiceItemLayout">@layout/select_dialog_singlechoice_holo</item> </style> - <style name="AlertDialog.Quantum.Light"> - <item name="fullDark">@drawable/dialog_full_holo_light</item> - <item name="topDark">@drawable/dialog_top_holo_light</item> - <item name="centerDark">@drawable/dialog_middle_holo_light</item> - <item name="bottomDark">@drawable/dialog_bottom_holo_light</item> - <item name="fullBright">@drawable/dialog_full_holo_light</item> - <item name="topBright">@drawable/dialog_top_holo_light</item> - <item name="centerBright">@drawable/dialog_middle_holo_light</item> - <item name="bottomBright">@drawable/dialog_bottom_holo_light</item> - <item name="bottomMedium">@drawable/dialog_bottom_holo_light</item> - <item name="centerMedium">@drawable/dialog_middle_holo_light</item> - </style> + <style name="AlertDialog.Quantum.Light" /> <!-- Window title --> <style name="WindowTitleBackground.Quantum"> diff --git a/core/res/res/values/themes_quantum.xml b/core/res/res/values/themes_quantum.xml index f0db46cf3b06..8ec93412ee76 100644 --- a/core/res/res/values/themes_quantum.xml +++ b/core/res/res/values/themes_quantum.xml @@ -49,42 +49,31 @@ please see themes_device_defaults.xml. <item name="disabledAlpha">0.5</item> <item name="backgroundDimAmount">0.6</item> - <item name="colorPressedHighlight">@color/holo_gray_light</item> - <item name="colorLongPressedHighlight">@color/holo_gray_bright</item> - <item name="colorFocusedHighlight">@color/holo_blue_dark</item> - <item name="colorMultiSelectHighlight">@color/holo_green_light</item> - <item name="colorActivatedHighlight">@color/holo_blue_dark</item> - <!-- Text styles --> <item name="textAppearance">@style/TextAppearance.Quantum</item> <item name="textAppearanceInverse">@style/TextAppearance.Quantum.Inverse</item> <item name="textColorPrimary">@color/primary_text_quantum_dark</item> - <item name="textColorSecondary">@color/secondary_text_quantum_dark</item> - <item name="textColorTertiary">@color/tertiary_text_quantum_dark</item> <item name="textColorPrimaryInverse">@color/primary_text_quantum_light</item> + <item name="textColorPrimaryDisableOnly">@color/primary_text_disable_only_quantum_dark</item> + <item name="textColorSecondary">@color/secondary_text_quantum_dark</item> <item name="textColorSecondaryInverse">@color/secondary_text_quantum_light</item> + <item name="textColorTertiary">@color/tertiary_text_quantum_dark</item> <item name="textColorTertiaryInverse">@color/tertiary_text_quantum_light</item> - <item name="textColorPrimaryDisableOnly">@color/primary_text_disable_only_quantum_dark</item> - <item name="textColorPrimaryInverseDisableOnly">@color/primary_text_disable_only_quantum_light</item> - <item name="textColorPrimaryNoDisable">@color/primary_text_nodisable_quantum_dark</item> - <item name="textColorSecondaryNoDisable">@color/secondary_text_nodisable_quantum_dark</item> - <item name="textColorPrimaryInverseNoDisable">@color/primary_text_nodisable_quantum_light</item> - <item name="textColorSecondaryInverseNoDisable">@color/secondary_text_nodisable_quantum_light</item> <item name="textColorHint">@color/hint_foreground_quantum_dark</item> <item name="textColorHintInverse">@color/hint_foreground_quantum_light</item> - <item name="textColorSearchUrl">@color/search_url_text_quantum_dark</item> <item name="textColorHighlight">@color/highlighted_text_quantum_dark</item> <item name="textColorHighlightInverse">@color/highlighted_text_quantum_light</item> - <item name="textColorLink">@color/holo_blue_light</item> - <item name="textColorLinkInverse">@color/holo_blue_light</item> + <item name="textColorLink">@color/quantum_teal_500</item> + <item name="textColorLinkInverse">@color/quantum_teal_500</item> + <item name="textColorSearchUrl">@color/search_url_text_quantum_dark</item> <item name="textColorAlertDialogListItem">@color/primary_text_quantum_dark</item> <item name="textAppearanceLarge">@style/TextAppearance.Quantum.Large</item> - <item name="textAppearanceMedium">@style/TextAppearance.Quantum.Medium</item> - <item name="textAppearanceSmall">@style/TextAppearance.Quantum.Small</item> <item name="textAppearanceLargeInverse">@style/TextAppearance.Quantum.Large.Inverse</item> + <item name="textAppearanceMedium">@style/TextAppearance.Quantum.Medium</item> <item name="textAppearanceMediumInverse">@style/TextAppearance.Quantum.Medium.Inverse</item> + <item name="textAppearanceSmall">@style/TextAppearance.Quantum.Small</item> <item name="textAppearanceSmallInverse">@style/TextAppearance.Quantum.Small.Inverse</item> <item name="textAppearanceSearchResultTitle">@style/TextAppearance.Quantum.SearchResult.Title</item> <item name="textAppearanceSearchResultSubtitle">@style/TextAppearance.Quantum.SearchResult.Subtitle</item> @@ -92,7 +81,7 @@ please see themes_device_defaults.xml. <item name="textAppearanceButton">@style/TextAppearance.Quantum.Widget.Button</item> <item name="editTextColor">?attr/textColorPrimary</item> - <item name="editTextBackground">@drawable/edit_text_holo_dark</item> + <item name="editTextBackground">@drawable/edit_text_quantum_dark</item> <item name="candidatesTextStyleSpans">@string/candidates_style</item> @@ -104,17 +93,16 @@ please see themes_device_defaults.xml. <!-- Button styles --> <item name="buttonStyle">@style/Widget.Quantum.Button</item> - <item name="buttonStyleSmall">@style/Widget.Quantum.Button.Small</item> <item name="buttonStyleInset">@style/Widget.Quantum.Button.Inset</item> - <item name="buttonStyleToggle">@style/Widget.Quantum.Button.Toggle</item> + <item name="switchStyle">@style/Widget.Quantum.CompoundButton.Switch</item> <item name="mediaRouteButtonStyle">@style/Widget.Quantum.MediaRouteButton</item> <item name="selectableItemBackground">@drawable/item_background_quantum_dark</item> <item name="borderlessButtonStyle">@style/Widget.Quantum.Button.Borderless</item> - <item name="homeAsUpIndicator">@drawable/ic_ab_back_holo_dark</item> + <item name="homeAsUpIndicator">@drawable/ic_ab_back_quantum_dark</item> <!-- List attributes --> <item name="listPreferredItemHeight">64dip</item> @@ -129,17 +117,17 @@ please see themes_device_defaults.xml. <!-- @hide --> <item name="searchResultListItemHeight">58dip</item> - <item name="listDivider">@drawable/list_divider_holo_dark</item> + <item name="listDivider">@drawable/list_divider_quantum_dark</item> <item name="listSeparatorTextViewStyle">@style/Widget.Quantum.TextView.ListSeparator</item> - <item name="listChoiceIndicatorSingle">@drawable/btn_radio_holo_dark</item> - <item name="listChoiceIndicatorMultiple">@drawable/btn_check_holo_dark</item> + <item name="listChoiceIndicatorSingle">@drawable/btn_radio_quantum_dark</item> + <item name="listChoiceIndicatorMultiple">@drawable/btn_check_quantum_dark</item> <item name="listChoiceBackgroundIndicator">@drawable/list_selector_quantum_dark</item> - <item name="activatedBackgroundIndicator">@drawable/activated_background_holo_dark</item> + <item name="activatedBackgroundIndicator">@drawable/activated_background_quantum_dark</item> - <item name="listDividerAlertDialog">@drawable/list_divider_holo_dark</item> + <item name="listDividerAlertDialog">@drawable/list_divider_quantum_dark</item> <item name="expandableListPreferredItemPaddingLeft">40dip</item> <item name="expandableListPreferredChildPaddingLeft">?attr/expandableListPreferredItemPaddingLeft</item> @@ -148,8 +136,8 @@ please see themes_device_defaults.xml. <item name="expandableListPreferredItemIndicatorRight">0dip</item> <item name="expandableListPreferredChildIndicatorLeft">?attr/expandableListPreferredItemIndicatorLeft</item> <item name="expandableListPreferredChildIndicatorRight">?attr/expandableListPreferredItemIndicatorRight</item> - <item name="findOnPageNextDrawable">@drawable/ic_find_next_holo_dark</item> - <item name="findOnPagePreviousDrawable">@drawable/ic_find_previous_holo_dark</item> + <item name="findOnPageNextDrawable">@drawable/ic_find_next_quantum_dark</item> + <item name="findOnPagePreviousDrawable">@drawable/ic_find_previous_quantum_dark</item> <!-- Gallery attributes --> <item name="galleryItemBackground">@drawable/gallery_item_background</item> @@ -182,7 +170,7 @@ please see themes_device_defaults.xml. <item name="alertDialogTheme">@style/Theme.Quantum.Dialog.Alert</item> <item name="alertDialogStyle">@style/AlertDialog.Quantum</item> <item name="alertDialogCenterButtons">false</item> - <item name="alertDialogIcon">@drawable/ic_dialog_alert_holo_dark</item> + <item name="alertDialogIcon">@drawable/ic_dialog_alert_quantum_dark</item> <!-- Presentation attributes --> <item name="presentationTheme">@style/Theme.Quantum.Dialog.Presentation</item> @@ -191,7 +179,7 @@ please see themes_device_defaults.xml. <item name="toastFrameBackground">@drawable/toast_frame</item> <!-- Panel attributes --> - <item name="panelBackground">@drawable/menu_hardkey_panel_holo_dark</item> + <item name="panelBackground">?attr/colorBackground</item> <item name="panelFullBackground">@drawable/menu_background_fill_parent_width</item> <!-- These three attributes do not seems to be used by the framework. Declared public though --> <item name="panelColorBackground">#000</item> @@ -206,8 +194,8 @@ please see themes_device_defaults.xml. <item name="scrollbarFadeDuration">250</item> <item name="scrollbarDefaultDelayBeforeFade">300</item> <item name="scrollbarSize">10dip</item> - <item name="scrollbarThumbHorizontal">@drawable/scrollbar_handle_holo_dark</item> - <item name="scrollbarThumbVertical">@drawable/scrollbar_handle_holo_dark</item> + <item name="scrollbarThumbHorizontal">@drawable/scrollbar_handle_quantum_dark</item> + <item name="scrollbarThumbVertical">@drawable/scrollbar_handle_quantum_dark</item> <item name="scrollbarTrackHorizontal">@null</item> <item name="scrollbarTrackVertical">@null</item> @@ -217,7 +205,7 @@ please see themes_device_defaults.xml. <item name="textSelectHandle">@drawable/text_select_handle_middle</item> <item name="textSelectHandleWindowStyle">@style/Widget.Quantum.TextSelectHandle</item> <item name="textSuggestionsWindowStyle">@style/Widget.Quantum.TextSuggestionsPopupWindow</item> - <item name="textCursorDrawable">@drawable/text_cursor_holo_dark</item> + <item name="textCursorDrawable">@drawable/text_cursor_quantum_dark</item> <!-- Widget styles --> <item name="absListViewStyle">@style/Widget.Quantum.AbsListView</item> @@ -291,7 +279,7 @@ please see themes_device_defaults.xml. <item name="editTextPreferenceStyle">@style/Preference.Quantum.DialogPreference.EditTextPreference</item> <item name="ringtonePreferenceStyle">@style/Preference.Quantum.RingtonePreference</item> <item name="preferenceLayoutChild">@layout/preference_child_holo</item> - <item name="detailsElementBackground">@drawable/panel_bg_holo_dark</item> + <item name="detailsElementBackground">?attr/colorBackground</item> <!-- Search widget styles --> <item name="searchWidgetCorpusItemBackground">@color/search_widget_corpus_item_background</item> @@ -300,9 +288,9 @@ please see themes_device_defaults.xml. <item name="actionDropDownStyle">@style/Widget.Quantum.Spinner.DropDown.ActionBar</item> <item name="actionButtonStyle">@style/Widget.Quantum.ActionButton</item> <item name="actionOverflowButtonStyle">@style/Widget.Quantum.ActionButton.Overflow</item> - <item name="actionModeBackground">@drawable/cab_background_top_holo_dark</item> - <item name="actionModeSplitBackground">@drawable/cab_background_bottom_holo_dark</item> - <item name="actionModeCloseDrawable">@drawable/ic_cab_done_holo_dark</item> + <item name="actionModeBackground">@color/theme_color_700</item> + <item name="actionModeSplitBackground">@color/theme_color_700</item> + <item name="actionModeCloseDrawable">@drawable/ic_cab_done_quantum_dark</item> <item name="actionBarTabStyle">@style/Widget.Quantum.ActionBar.TabView</item> <item name="actionBarTabBarStyle">@style/Widget.Quantum.ActionBar.TabBar</item> <item name="actionBarTabTextStyle">@style/Widget.Quantum.ActionBar.TabText</item> @@ -312,14 +300,15 @@ please see themes_device_defaults.xml. <item name="actionBarSize">@dimen/action_bar_default_height</item> <item name="actionModePopupWindowStyle">@style/Widget.Quantum.PopupWindow.ActionMode</item> <item name="actionBarWidgetTheme">@null</item> + <item name="actionBarItemBackground">@drawable/item_background_borderless_quantum_dark</item> - <item name="actionModeCutDrawable">@drawable/ic_menu_cut_holo_dark</item> - <item name="actionModeCopyDrawable">@drawable/ic_menu_copy_holo_dark</item> - <item name="actionModePasteDrawable">@drawable/ic_menu_paste_holo_dark</item> - <item name="actionModeSelectAllDrawable">@drawable/ic_menu_selectall_holo_dark</item> - <item name="actionModeShareDrawable">@drawable/ic_menu_share_holo_dark</item> - <item name="actionModeFindDrawable">@drawable/ic_menu_find_holo_dark</item> - <item name="actionModeWebSearchDrawable">@drawable/ic_menu_search_holo_dark</item> + <item name="actionModeCutDrawable">@drawable/ic_menu_cut_quantum_dark</item> + <item name="actionModeCopyDrawable">@drawable/ic_menu_copy_quantum_dark</item> + <item name="actionModePasteDrawable">@drawable/ic_menu_paste_quantum_dark</item> + <item name="actionModeSelectAllDrawable">@drawable/ic_menu_selectall_quantum_dark</item> + <item name="actionModeShareDrawable">@drawable/ic_menu_share_quantum_dark</item> + <item name="actionModeFindDrawable">@drawable/ic_menu_find_quantum_dark</item> + <item name="actionModeWebSearchDrawable">@drawable/ic_menu_search_quantum_dark</item> <item name="dividerVertical">?attr/listDivider</item> <item name="dividerHorizontal">?attr/listDivider</item> @@ -359,12 +348,12 @@ please see themes_device_defaults.xml. <!-- DatePicker style --> <item name="datePickerStyle">@style/Widget.Quantum.DatePicker</item> - <item name="fastScrollThumbDrawable">@drawable/fastscroll_thumb_holo</item> + <!-- TODO: This belongs in a FastScroll style --> + <item name="fastScrollThumbDrawable">@drawable/fastscroll_thumb_quantum_light</item> <item name="fastScrollPreviewBackgroundLeft">@drawable/fastscroll_label_left_holo_dark</item> <item name="fastScrollPreviewBackgroundRight">@drawable/fastscroll_label_right_holo_dark</item> - <item name="fastScrollTrackDrawable">@drawable/fastscroll_track_holo_dark</item> + <item name="fastScrollTrackDrawable">@drawable/fastscroll_track_quantum_dark</item> <item name="fastScrollOverlayPosition">atThumb</item> - </style> <!-- Quantum Paper theme (light version). --> @@ -376,42 +365,32 @@ please see themes_device_defaults.xml. <item name="disabledAlpha">0.5</item> <item name="backgroundDimAmount">0.6</item> - <item name="colorPressedHighlight">@color/holo_gray_light</item> - <item name="colorLongPressedHighlight">@color/holo_gray_bright</item> - <item name="colorFocusedHighlight">@color/holo_blue_dark</item> - <item name="colorMultiSelectHighlight">@color/holo_green_light</item> - <item name="colorActivatedHighlight">@color/holo_blue_dark</item> - <!-- Text styles --> <item name="textAppearance">@style/TextAppearance.Quantum.Light</item> <item name="textAppearanceInverse">@style/TextAppearance.Quantum.Light.Inverse</item> <item name="textColorPrimary">@color/primary_text_quantum_light</item> - <item name="textColorSecondary">@color/secondary_text_quantum_light</item> - <item name="textColorTertiary">@color/tertiary_text_quantum_light</item> <item name="textColorPrimaryInverse">@color/primary_text_quantum_dark</item> + <item name="textColorSecondary">@color/secondary_text_quantum_light</item> <item name="textColorSecondaryInverse">@color/secondary_text_quantum_dark</item> + <item name="textColorTertiary">@color/tertiary_text_quantum_light</item> <item name="textColorTertiaryInverse">@color/tertiary_text_quantum_dark</item> <item name="textColorPrimaryDisableOnly">@color/primary_text_disable_only_quantum_light</item> <item name="textColorPrimaryInverseDisableOnly">@color/primary_text_disable_only_quantum_dark</item> - <item name="textColorPrimaryNoDisable">@color/primary_text_nodisable_quantum_light</item> - <item name="textColorSecondaryNoDisable">@color/secondary_text_nodisable_quantum_light</item> - <item name="textColorPrimaryInverseNoDisable">@color/primary_text_nodisable_quantum_dark</item> - <item name="textColorSecondaryInverseNoDisable">@color/secondary_text_nodisable_quantum_dark</item> <item name="textColorHint">@color/hint_foreground_quantum_light</item> <item name="textColorHintInverse">@color/hint_foreground_quantum_dark</item> - <item name="textColorSearchUrl">@color/search_url_text_quantum_light</item> <item name="textColorHighlight">@color/highlighted_text_quantum_light</item> <item name="textColorHighlightInverse">@color/highlighted_text_quantum_dark</item> - <item name="textColorLink">@color/holo_blue_light</item> - <item name="textColorLinkInverse">@color/holo_blue_light</item> + <item name="textColorLink">@color/quantum_teal_500</item> + <item name="textColorLinkInverse">@color/quantum_teal_500</item> + <item name="textColorSearchUrl">@color/search_url_text_quantum_light</item> <item name="textColorAlertDialogListItem">@color/primary_text_quantum_light</item> <item name="textAppearanceLarge">@style/TextAppearance.Quantum.Light.Large</item> - <item name="textAppearanceMedium">@style/TextAppearance.Quantum.Light.Medium</item> - <item name="textAppearanceSmall">@style/TextAppearance.Quantum.Light.Small</item> <item name="textAppearanceLargeInverse">@style/TextAppearance.Quantum.Light.Large.Inverse</item> + <item name="textAppearanceMedium">@style/TextAppearance.Quantum.Light.Medium</item> <item name="textAppearanceMediumInverse">@style/TextAppearance.Quantum.Light.Medium.Inverse</item> + <item name="textAppearanceSmall">@style/TextAppearance.Quantum.Light.Small</item> <item name="textAppearanceSmallInverse">@style/TextAppearance.Quantum.Light.Small.Inverse</item> <item name="textAppearanceSearchResultTitle">@style/TextAppearance.Quantum.Light.SearchResult.Title</item> <item name="textAppearanceSearchResultSubtitle">@style/TextAppearance.Quantum.Light.SearchResult.Subtitle</item> @@ -419,7 +398,7 @@ please see themes_device_defaults.xml. <item name="textAppearanceButton">@style/TextAppearance.Quantum.Light.Widget.Button</item> <item name="editTextColor">?attr/textColorPrimary</item> - <item name="editTextBackground">@drawable/edit_text_holo_light</item> + <item name="editTextBackground">@drawable/edit_text_quantum_light</item> <item name="candidatesTextStyleSpans">@string/candidates_style</item> @@ -441,7 +420,7 @@ please see themes_device_defaults.xml. <item name="selectableItemBackground">@drawable/item_background_quantum_light</item> <item name="borderlessButtonStyle">@style/Widget.Quantum.Light.Button.Borderless</item> - <item name="homeAsUpIndicator">@drawable/ic_ab_back_holo_light</item> + <item name="homeAsUpIndicator">@drawable/ic_ab_back_quantum_light</item> <!-- List attributes --> <item name="listPreferredItemHeight">64dip</item> @@ -456,15 +435,15 @@ please see themes_device_defaults.xml. <!-- @hide --> <item name="searchResultListItemHeight">58dip</item> - <item name="listDivider">@drawable/list_divider_holo_light</item> + <item name="listDivider">@drawable/list_divider_quantum_light</item> <item name="listSeparatorTextViewStyle">@style/Widget.Quantum.Light.TextView.ListSeparator</item> - <item name="listChoiceIndicatorSingle">@drawable/btn_radio_holo_light</item> - <item name="listChoiceIndicatorMultiple">@drawable/btn_check_holo_light</item> + <item name="listChoiceIndicatorSingle">@drawable/btn_radio_quantum_light</item> + <item name="listChoiceIndicatorMultiple">@drawable/btn_check_quantum_light</item> <item name="listChoiceBackgroundIndicator">@drawable/list_selector_quantum_light</item> - <item name="activatedBackgroundIndicator">@drawable/activated_background_holo_light</item> + <item name="activatedBackgroundIndicator">@drawable/activated_background_quantum_light</item> <item name="expandableListPreferredItemPaddingLeft">40dip</item> <item name="expandableListPreferredChildPaddingLeft">?attr/expandableListPreferredItemPaddingLeft</item> @@ -474,9 +453,9 @@ please see themes_device_defaults.xml. <item name="expandableListPreferredChildIndicatorLeft">?attr/expandableListPreferredItemIndicatorLeft</item> <item name="expandableListPreferredChildIndicatorRight">?attr/expandableListPreferredItemIndicatorRight</item> - <item name="listDividerAlertDialog">@drawable/list_divider_holo_light</item> - <item name="findOnPageNextDrawable">@drawable/ic_find_next_holo_light</item> - <item name="findOnPagePreviousDrawable">@drawable/ic_find_previous_holo_light</item> + <item name="listDividerAlertDialog">@drawable/list_divider_quantum_light</item> + <item name="findOnPageNextDrawable">@drawable/ic_find_next_quantum_light</item> + <item name="findOnPagePreviousDrawable">@drawable/ic_find_previous_quantum_light</item> <!-- Gallery attributes --> <item name="galleryItemBackground">@drawable/gallery_item_background</item> @@ -488,7 +467,7 @@ please see themes_device_defaults.xml. <item name="windowFullscreen">false</item> <item name="windowOverscan">false</item> <item name="windowIsFloating">false</item> - <item name="windowContentOverlay">@drawable/ab_solid_shadow_holo</item> + <item name="windowContentOverlay">@drawable/ab_solid_shadow_qntm</item> <item name="windowShowWallpaper">false</item> <item name="windowTitleStyle">@style/WindowTitle.Quantum</item> <item name="windowTitleSize">25dip</item> @@ -508,7 +487,7 @@ please see themes_device_defaults.xml. <item name="alertDialogTheme">@style/Theme.Quantum.Light.Dialog.Alert</item> <item name="alertDialogStyle">@style/AlertDialog.Quantum.Light</item> <item name="alertDialogCenterButtons">false</item> - <item name="alertDialogIcon">@drawable/ic_dialog_alert_holo_light</item> + <item name="alertDialogIcon">@drawable/ic_dialog_alert_quantum_light</item> <!-- Presentation attributes --> <item name="presentationTheme">@style/Theme.Quantum.Light.Dialog.Presentation</item> @@ -517,7 +496,7 @@ please see themes_device_defaults.xml. <item name="toastFrameBackground">@drawable/toast_frame</item> <!-- Panel attributes --> - <item name="panelBackground">@drawable/menu_hardkey_panel_holo_light</item> + <item name="panelBackground">?attr/colorBackground</item> <item name="panelFullBackground">@drawable/menu_background_fill_parent_width</item> <!-- These three attributes do not seems to be used by the framework. Declared public though --> <item name="panelColorBackground">#000</item> @@ -532,8 +511,8 @@ please see themes_device_defaults.xml. <item name="scrollbarFadeDuration">250</item> <item name="scrollbarDefaultDelayBeforeFade">300</item> <item name="scrollbarSize">10dip</item> - <item name="scrollbarThumbHorizontal">@drawable/scrollbar_handle_holo_light</item> - <item name="scrollbarThumbVertical">@drawable/scrollbar_handle_holo_light</item> + <item name="scrollbarThumbHorizontal">@drawable/scrollbar_handle_quantum_light</item> + <item name="scrollbarThumbVertical">@drawable/scrollbar_handle_quantum_light</item> <item name="scrollbarTrackHorizontal">@null</item> <item name="scrollbarTrackVertical">@null</item> @@ -543,7 +522,7 @@ please see themes_device_defaults.xml. <item name="textSelectHandle">@drawable/text_select_handle_middle</item> <item name="textSelectHandleWindowStyle">@style/Widget.Quantum.TextSelectHandle</item> <item name="textSuggestionsWindowStyle">@style/Widget.Quantum.Light.TextSuggestionsPopupWindow</item> - <item name="textCursorDrawable">@drawable/text_cursor_holo_light</item> + <item name="textCursorDrawable">@drawable/text_cursor_quantum_light</item> <!-- Widget styles --> <item name="absListViewStyle">@style/Widget.Quantum.Light.AbsListView</item> @@ -617,7 +596,7 @@ please see themes_device_defaults.xml. <item name="editTextPreferenceStyle">@style/Preference.Quantum.DialogPreference.EditTextPreference</item> <item name="ringtonePreferenceStyle">@style/Preference.Quantum.RingtonePreference</item> <item name="preferenceLayoutChild">@layout/preference_child_holo</item> - <item name="detailsElementBackground">@drawable/panel_bg_holo_light</item> + <item name="detailsElementBackground">?attr/colorBackground</item> <!-- PreferenceFrameLayout attributes --> <item name="preferenceFrameLayoutStyle">@style/Widget.Quantum.PreferenceFrameLayout</item> @@ -631,7 +610,7 @@ please see themes_device_defaults.xml. <item name="actionOverflowButtonStyle">@style/Widget.Quantum.Light.ActionButton.Overflow</item> <item name="actionModeBackground">@drawable/cab_background_top_holo_light</item> <item name="actionModeSplitBackground">@drawable/cab_background_bottom_holo_light</item> - <item name="actionModeCloseDrawable">@drawable/ic_cab_done_holo_light</item> + <item name="actionModeCloseDrawable">@drawable/ic_cab_done_quantum_light</item> <item name="actionBarTabStyle">@style/Widget.Quantum.Light.ActionBar.TabView</item> <item name="actionBarTabBarStyle">@style/Widget.Quantum.Light.ActionBar.TabBar</item> <item name="actionBarTabTextStyle">@style/Widget.Quantum.Light.ActionBar.TabText</item> @@ -641,14 +620,15 @@ please see themes_device_defaults.xml. <item name="actionBarSize">@dimen/action_bar_default_height</item> <item name="actionModePopupWindowStyle">@style/Widget.Quantum.Light.PopupWindow.ActionMode</item> <item name="actionBarWidgetTheme">@null</item> + <item name="actionBarItemBackground">@drawable/item_background_borderless_quantum_light</item> - <item name="actionModeCutDrawable">@drawable/ic_menu_cut_holo_light</item> - <item name="actionModeCopyDrawable">@drawable/ic_menu_copy_holo_light</item> - <item name="actionModePasteDrawable">@drawable/ic_menu_paste_holo_light</item> - <item name="actionModeSelectAllDrawable">@drawable/ic_menu_selectall_holo_light</item> - <item name="actionModeShareDrawable">@drawable/ic_menu_share_holo_light</item> - <item name="actionModeFindDrawable">@drawable/ic_menu_find_holo_light</item> - <item name="actionModeWebSearchDrawable">@drawable/ic_menu_search_holo_light</item> + <item name="actionModeCutDrawable">@drawable/ic_menu_cut_quantum_light</item> + <item name="actionModeCopyDrawable">@drawable/ic_menu_copy_quantum_light</item> + <item name="actionModePasteDrawable">@drawable/ic_menu_paste_quantum_light</item> + <item name="actionModeSelectAllDrawable">@drawable/ic_menu_selectall_quantum_light</item> + <item name="actionModeShareDrawable">@drawable/ic_menu_share_quantum_light</item> + <item name="actionModeFindDrawable">@drawable/ic_menu_find_quantum_light</item> + <item name="actionModeWebSearchDrawable">@drawable/ic_menu_search_quantum_light</item> <item name="dividerVertical">?attr/listDivider</item> <item name="dividerHorizontal">?attr/listDivider</item> @@ -685,45 +665,18 @@ please see themes_device_defaults.xml. <!-- DatePicker style --> <item name="datePickerStyle">@style/Widget.Quantum.Light.DatePicker</item> - <item name="fastScrollThumbDrawable">@drawable/fastscroll_thumb_holo</item> + <item name="fastScrollThumbDrawable">@drawable/fastscroll_thumb_quantum_light</item> <item name="fastScrollPreviewBackgroundLeft">@drawable/fastscroll_label_left_holo_light</item> <item name="fastScrollPreviewBackgroundRight">@drawable/fastscroll_label_right_holo_light</item> - <item name="fastScrollTrackDrawable">@drawable/fastscroll_track_holo_light</item> + <item name="fastScrollTrackDrawable">@drawable/fastscroll_track_quantum_light</item> <item name="fastScrollOverlayPosition">atThumb</item> - </style> <!-- Variant of the quantum (light) theme that has a solid (opaque) action bar with an inverse color profile. The dark action bar sharply stands out against the light content. --> <style name="Theme.Quantum.Light.DarkActionBar"> - <item name="windowContentOverlay">@drawable/ab_solid_shadow_holo</item> - <item name="actionBarStyle">@style/Widget.Quantum.Light.ActionBar.Solid.Inverse</item> - <item name="actionBarWidgetTheme">@style/Theme.Quantum</item> - - <item name="actionDropDownStyle">@style/Widget.Quantum.Spinner.DropDown.ActionBar</item> - <item name="actionButtonStyle">@style/Widget.Quantum.ActionButton</item> - <item name="actionOverflowButtonStyle">@style/Widget.Quantum.ActionButton.Overflow</item> - <item name="actionModeBackground">@drawable/cab_background_top_holo_dark</item> - <item name="actionModeSplitBackground">@drawable/cab_background_bottom_holo_dark</item> - <item name="actionModeCloseDrawable">@drawable/ic_cab_done_holo_dark</item> - <item name="homeAsUpIndicator">@drawable/ic_ab_back_holo_dark</item> - <item name="actionBarTabStyle">@style/Widget.Quantum.Light.ActionBar.TabView.Inverse</item> - <item name="actionBarTabBarStyle">@style/Widget.Quantum.Light.ActionBar.TabBar.Inverse</item> - <item name="actionBarTabTextStyle">@style/Widget.Quantum.Light.ActionBar.TabText.Inverse</item> - <item name="actionBarDivider">@drawable/list_divider_holo_dark</item> - <item name="actionMenuTextColor">?attr/textColorPrimaryInverse</item> - <item name="actionModeStyle">@style/Widget.Quantum.Light.ActionMode.Inverse</item> - <item name="actionModeCloseButtonStyle">@style/Widget.Quantum.ActionButton.CloseMode</item> - <item name="actionModePopupWindowStyle">@style/Widget.Quantum.PopupWindow.ActionMode</item> - - <item name="actionModeCutDrawable">@drawable/ic_menu_cut_holo_dark</item> - <item name="actionModeCopyDrawable">@drawable/ic_menu_copy_holo_dark</item> - <item name="actionModePasteDrawable">@drawable/ic_menu_paste_holo_dark</item> - <item name="actionModeSelectAllDrawable">@drawable/ic_menu_selectall_holo_dark</item> - <item name="actionModeShareDrawable">@drawable/ic_menu_share_holo_dark</item> - <item name="actionModeFindDrawable">@drawable/ic_menu_find_holo_dark</item> - <item name="actionModeWebSearchDrawable">@drawable/ic_menu_search_holo_dark</item> + <item name="actionBarTheme">@style/Theme.Quantum</item> </style> <!-- Variant of the quantum (dark) theme with no action bar. --> @@ -877,7 +830,7 @@ please see themes_device_defaults.xml. <style name="Theme.Quantum.Dialog"> <item name="windowFrame">@null</item> <item name="windowTitleStyle">@style/DialogWindowTitle.Quantum</item> - <item name="windowBackground">@drawable/dialog_full_holo_dark</item> + <item name="windowBackground">?attr/colorBackground</item> <item name="windowIsFloating">true</item> <item name="windowContentOverlay">@null</item> <item name="windowAnimationStyle">@style/Animation.Quantum.Dialog</item> @@ -999,7 +952,7 @@ please see themes_device_defaults.xml. <style name="Theme.Quantum.Light.Dialog"> <item name="windowFrame">@null</item> <item name="windowTitleStyle">@style/DialogWindowTitle.Quantum.Light</item> - <item name="windowBackground">@drawable/dialog_full_holo_light</item> + <item name="windowBackground">?attr/colorBackground</item> <item name="windowIsFloating">true</item> <item name="windowContentOverlay">@null</item> <item name="windowAnimationStyle">@style/Animation.Quantum.Dialog</item> |
