diff options
author | Alan Viverette <alanv@google.com> | 2014-06-06 15:48:55 -0700 |
---|---|---|
committer | Alan Viverette <alanv@google.com> | 2014-06-06 15:48:55 -0700 |
commit | 830960cce032a1b0dc0cf54bcc44ffa339388c21 (patch) | |
tree | 8729b267ce649cb0593202c30748cd94132a7f84 /core/res/res/color | |
parent | 052027dc9068708e5d166853f434274188a48753 (diff) | |
download | frameworks_base-830960cce032a1b0dc0cf54bcc44ffa339388c21.zip frameworks_base-830960cce032a1b0dc0cf54bcc44ffa339388c21.tar.gz frameworks_base-830960cce032a1b0dc0cf54bcc44ffa339388c21.tar.bz2 |
Material theme
BUG: 15467097
Change-Id: I15191362e104a902895418fc615892c21db64c35
Diffstat (limited to 'core/res/res/color')
-rw-r--r-- | core/res/res/color/background_cache_hint_selector_material_dark.xml (renamed from core/res/res/color/background_cache_hint_selector_quantum_dark.xml) | 2 | ||||
-rw-r--r-- | core/res/res/color/background_cache_hint_selector_material_light.xml (renamed from core/res/res/color/background_cache_hint_selector_quantum_light.xml) | 2 | ||||
-rw-r--r-- | core/res/res/color/btn_default_material_dark.xml (renamed from core/res/res/color/btn_default_quantum_dark.xml) | 4 | ||||
-rw-r--r-- | core/res/res/color/btn_default_material_light.xml (renamed from core/res/res/color/btn_default_quantum_light.xml) | 4 | ||||
-rw-r--r-- | core/res/res/color/primary_text_disable_only_material_dark.xml (renamed from core/res/res/color/primary_text_disable_only_quantum_dark.xml) | 4 | ||||
-rw-r--r-- | core/res/res/color/primary_text_disable_only_material_light.xml (renamed from core/res/res/color/primary_text_disable_only_quantum_light.xml) | 4 | ||||
-rw-r--r-- | core/res/res/color/primary_text_material_dark.xml (renamed from core/res/res/color/primary_text_quantum_light.xml) | 4 | ||||
-rw-r--r-- | core/res/res/color/primary_text_material_light.xml (renamed from core/res/res/color/primary_text_quantum_dark.xml) | 4 | ||||
-rw-r--r-- | core/res/res/color/search_url_text_material_dark.xml (renamed from core/res/res/color/search_url_text_quantum_dark.xml) | 0 | ||||
-rw-r--r-- | core/res/res/color/search_url_text_material_light.xml (renamed from core/res/res/color/search_url_text_quantum_light.xml) | 0 |
10 files changed, 14 insertions, 14 deletions
diff --git a/core/res/res/color/background_cache_hint_selector_quantum_dark.xml b/core/res/res/color/background_cache_hint_selector_material_dark.xml index ab66501..e7c9426 100644 --- a/core/res/res/color/background_cache_hint_selector_quantum_dark.xml +++ b/core/res/res/color/background_cache_hint_selector_material_dark.xml @@ -15,6 +15,6 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_accelerated="false" android:color="@android:color/background_quantum_dark" /> + <item android:state_accelerated="false" android:color="@android:color/background_material_dark" /> <item android:color="@android:color/transparent" /> </selector> diff --git a/core/res/res/color/background_cache_hint_selector_quantum_light.xml b/core/res/res/color/background_cache_hint_selector_material_light.xml index fb940a9..96f1f59 100644 --- a/core/res/res/color/background_cache_hint_selector_quantum_light.xml +++ b/core/res/res/color/background_cache_hint_selector_material_light.xml @@ -15,6 +15,6 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_accelerated="false" android:color="@android:color/background_quantum_light" /> + <item android:state_accelerated="false" android:color="@android:color/background_material_light" /> <item android:color="@android:color/transparent" /> </selector> diff --git a/core/res/res/color/btn_default_quantum_dark.xml b/core/res/res/color/btn_default_material_dark.xml index ec0f140..59555ae 100644 --- a/core/res/res/color/btn_default_quantum_dark.xml +++ b/core/res/res/color/btn_default_material_dark.xml @@ -15,6 +15,6 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_enabled="false" android:alpha="0.5" android:color="@color/button_quantum_dark"/> - <item android:color="@color/button_quantum_dark"/> + <item android:state_enabled="false" android:alpha="0.5" android:color="@color/button_material_dark"/> + <item android:color="@color/button_material_dark"/> </selector> diff --git a/core/res/res/color/btn_default_quantum_light.xml b/core/res/res/color/btn_default_material_light.xml index 9536d24..6511a22 100644 --- a/core/res/res/color/btn_default_quantum_light.xml +++ b/core/res/res/color/btn_default_material_light.xml @@ -15,6 +15,6 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_enabled="false" android:alpha="0.5" android:color="@color/button_quantum_light"/> - <item android:color="@color/button_quantum_light"/> + <item android:state_enabled="false" android:alpha="0.5" android:color="@color/button_material_light"/> + <item android:color="@color/button_material_light"/> </selector> diff --git a/core/res/res/color/primary_text_disable_only_quantum_dark.xml b/core/res/res/color/primary_text_disable_only_material_dark.xml index 60a91f2..cf7acaa 100644 --- a/core/res/res/color/primary_text_disable_only_quantum_dark.xml +++ b/core/res/res/color/primary_text_disable_only_material_dark.xml @@ -15,6 +15,6 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <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"/> + <item android:state_enabled="false" android:alpha="0.5" android:color="@android:color/bright_foreground_material_dark"/> + <item android:color="@android:color/bright_foreground_material_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_material_light.xml index ced9051..bf5d2c0 100644 --- a/core/res/res/color/primary_text_disable_only_quantum_light.xml +++ b/core/res/res/color/primary_text_disable_only_material_light.xml @@ -15,6 +15,6 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <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"/> + <item android:state_enabled="false" android:alpha="0.5" android:color="@android:color/bright_foreground_material_light"/> + <item android:color="@android:color/bright_foreground_material_light"/> </selector> diff --git a/core/res/res/color/primary_text_quantum_light.xml b/core/res/res/color/primary_text_material_dark.xml index 1ec1634..caef9d0 100644 --- a/core/res/res/color/primary_text_quantum_light.xml +++ b/core/res/res/color/primary_text_material_dark.xml @@ -15,6 +15,6 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_enabled="false" android:alpha="0.5" android:color="@color/primary_text_default_quantum_light"/> - <item android:color="@color/primary_text_default_quantum_light"/> + <item android:state_enabled="false" android:alpha="0.5" android:color="@color/primary_text_default_material_dark"/> + <item android:color="@color/primary_text_default_material_dark"/> </selector> diff --git a/core/res/res/color/primary_text_quantum_dark.xml b/core/res/res/color/primary_text_material_light.xml index 1fcd0e3..81a593b 100644 --- a/core/res/res/color/primary_text_quantum_dark.xml +++ b/core/res/res/color/primary_text_material_light.xml @@ -15,6 +15,6 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_enabled="false" android:alpha="0.5" android:color="@color/primary_text_default_quantum_dark"/> - <item android:color="@color/primary_text_default_quantum_dark"/> + <item android:state_enabled="false" android:alpha="0.5" android:color="@color/primary_text_default_material_light"/> + <item android:color="@color/primary_text_default_material_light"/> </selector> diff --git a/core/res/res/color/search_url_text_quantum_dark.xml b/core/res/res/color/search_url_text_material_dark.xml index 5263fd7..5263fd7 100644 --- a/core/res/res/color/search_url_text_quantum_dark.xml +++ b/core/res/res/color/search_url_text_material_dark.xml diff --git a/core/res/res/color/search_url_text_quantum_light.xml b/core/res/res/color/search_url_text_material_light.xml index 5263fd7..5263fd7 100644 --- a/core/res/res/color/search_url_text_quantum_light.xml +++ b/core/res/res/color/search_url_text_material_light.xml |