diff options
| author | Alan Viverette <alanv@google.com> | 2014-08-07 17:17:43 -0700 |
|---|---|---|
| committer | Alan Viverette <alanv@google.com> | 2014-08-08 00:18:23 +0000 |
| commit | b1e1dbfb36b658bd2710fedf8c0381a5d89fa302 (patch) | |
| tree | 8be4e8a74b6d3e812d09d4b64aac01b6435e73c5 /core/res/res/color | |
| parent | 5983b101bde284a0c0d5c78ad3b476cad59b5cc0 (diff) | |
| download | frameworks_base-b1e1dbfb36b658bd2710fedf8c0381a5d89fa302.zip frameworks_base-b1e1dbfb36b658bd2710fedf8c0381a5d89fa302.tar.gz frameworks_base-b1e1dbfb36b658bd2710fedf8c0381a5d89fa302.tar.bz2 | |
Update disabled states to be less opaque
Also adds Resources method for retrieving floating-point values.
BUG: 16374059
Change-Id: I68c6a40cbe5badfad624548b9abf2d657dbc2019
Diffstat (limited to 'core/res/res/color')
6 files changed, 20 insertions, 8 deletions
diff --git a/core/res/res/color/btn_default_material_dark.xml b/core/res/res/color/btn_default_material_dark.xml index 59555ae..7c904cd 100644 --- a/core/res/res/color/btn_default_material_dark.xml +++ b/core/res/res/color/btn_default_material_dark.xml @@ -15,6 +15,8 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_enabled="false" android:alpha="0.5" android:color="@color/button_material_dark"/> + <item android:state_enabled="false" + android:alpha="@dimen/disabled_alpha_material" + android:color="@color/button_material_dark"/> <item android:color="@color/button_material_dark"/> </selector> diff --git a/core/res/res/color/btn_default_material_light.xml b/core/res/res/color/btn_default_material_light.xml index 6511a22..738f9ad 100644 --- a/core/res/res/color/btn_default_material_light.xml +++ b/core/res/res/color/btn_default_material_light.xml @@ -15,6 +15,8 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_enabled="false" android:alpha="0.5" android:color="@color/button_material_light"/> + <item android:state_enabled="false" + android:alpha="@dimen/disabled_alpha_material" + 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_material_dark.xml b/core/res/res/color/primary_text_disable_only_material_dark.xml index cf7acaa..cdae790 100644 --- a/core/res/res/color/primary_text_disable_only_material_dark.xml +++ b/core/res/res/color/primary_text_disable_only_material_dark.xml @@ -15,6 +15,8 @@ --> <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_material_dark"/> - <item android:color="@android:color/bright_foreground_material_dark"/> + <item android:state_enabled="false" + android:alpha="@dimen/disabled_alpha_material" + android:color="@color/bright_foreground_material_dark"/> + <item android:color="@color/bright_foreground_material_dark"/> </selector> diff --git a/core/res/res/color/primary_text_disable_only_material_light.xml b/core/res/res/color/primary_text_disable_only_material_light.xml index bf5d2c0..0bf14d0 100644 --- a/core/res/res/color/primary_text_disable_only_material_light.xml +++ b/core/res/res/color/primary_text_disable_only_material_light.xml @@ -15,6 +15,8 @@ --> <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_material_light"/> - <item android:color="@android:color/bright_foreground_material_light"/> + <item android:state_enabled="false" + android:alpha="@dimen/disabled_alpha_material" + android:color="@color/bright_foreground_material_light"/> + <item android:color="@color/bright_foreground_material_light"/> </selector> diff --git a/core/res/res/color/primary_text_material_dark.xml b/core/res/res/color/primary_text_material_dark.xml index caef9d0..6ad837b 100644 --- a/core/res/res/color/primary_text_material_dark.xml +++ b/core/res/res/color/primary_text_material_dark.xml @@ -15,6 +15,8 @@ --> <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_material_dark"/> + <item android:state_enabled="false" + android:alpha="@dimen/disabled_alpha_material" + 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_material_light.xml b/core/res/res/color/primary_text_material_light.xml index 81a593b..4c19e12 100644 --- a/core/res/res/color/primary_text_material_light.xml +++ b/core/res/res/color/primary_text_material_light.xml @@ -15,6 +15,8 @@ --> <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_material_light"/> + <item android:state_enabled="false" + android:alpha="@dimen/disabled_alpha_material" + android:color="@color/primary_text_default_material_light"/> <item android:color="@color/primary_text_default_material_light"/> </selector> |