diff options
author | Alan Viverette <alanv@google.com> | 2014-08-29 15:20:13 -0700 |
---|---|---|
committer | Alan Viverette <alanv@google.com> | 2014-08-29 15:20:13 -0700 |
commit | 7ff48839b0149eba1ab46cfd1476854c2e664a81 (patch) | |
tree | 501da57c7c55e63f762aa433c1920ba62e28b2e5 /core/res/res/color | |
parent | 3e294e9921db619f5ef0adaf6124a78fd73911b2 (diff) | |
download | frameworks_base-7ff48839b0149eba1ab46cfd1476854c2e664a81.zip frameworks_base-7ff48839b0149eba1ab46cfd1476854c2e664a81.tar.gz frameworks_base-7ff48839b0149eba1ab46cfd1476854c2e664a81.tar.bz2 |
Variety of small UI tweaks
Updates dialog padding, text opacities on dark theme, progress bar
opacity, ripple background exit speed, remove unnecessary text color
attribute from action menu item layout, fix secondary and tertiary
disabled state text colors.
BUG: 17321765
BUG: 17333263
BUG: 17322159
BUG: 17330086
Change-Id: I14473a985b2c6b853afe7db535a2443e934238e9
Diffstat (limited to 'core/res/res/color')
8 files changed, 56 insertions, 12 deletions
diff --git a/core/res/res/color/btn_default_material_dark.xml b/core/res/res/color/btn_default_material_dark.xml index 7c904cd..9be1417 100644 --- a/core/res/res/color/btn_default_material_dark.xml +++ b/core/res/res/color/btn_default_material_dark.xml @@ -16,7 +16,7 @@ <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_enabled="false" - android:alpha="@dimen/disabled_alpha_material" - android:color="@color/button_material_dark"/> + android:alpha="@dimen/disabled_alpha_material_dark" + 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 738f9ad..af5afe6 100644 --- a/core/res/res/color/btn_default_material_light.xml +++ b/core/res/res/color/btn_default_material_light.xml @@ -16,7 +16,7 @@ <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_enabled="false" - android:alpha="@dimen/disabled_alpha_material" - android:color="@color/button_material_light"/> + android:alpha="@dimen/disabled_alpha_material_light" + 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 cdae790..a6296c9 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 @@ -16,7 +16,7 @@ <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_enabled="false" - android:alpha="@dimen/disabled_alpha_material" - android:color="@color/bright_foreground_material_dark"/> + android:alpha="@dimen/disabled_alpha_material_dark" + 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 0bf14d0..b781844 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 @@ -16,7 +16,7 @@ <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_enabled="false" - android:alpha="@dimen/disabled_alpha_material" - android:color="@color/bright_foreground_material_light"/> + android:alpha="@dimen/disabled_alpha_material_light" + 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 6ad837b..690f0ec 100644 --- a/core/res/res/color/primary_text_material_dark.xml +++ b/core/res/res/color/primary_text_material_dark.xml @@ -16,7 +16,7 @@ <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_enabled="false" - android:alpha="@dimen/disabled_alpha_material" - android:color="@color/primary_text_default_material_dark"/> + android:alpha="@dimen/disabled_alpha_material_dark" + 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 4c19e12..634ad94 100644 --- a/core/res/res/color/primary_text_material_light.xml +++ b/core/res/res/color/primary_text_material_light.xml @@ -16,7 +16,7 @@ <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_enabled="false" - android:alpha="@dimen/disabled_alpha_material" - android:color="@color/primary_text_default_material_light"/> + android:alpha="@dimen/disabled_alpha_material_light" + 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/secondary_text_material_dark.xml b/core/res/res/color/secondary_text_material_dark.xml new file mode 100644 index 0000000..5bddf96 --- /dev/null +++ b/core/res/res/color/secondary_text_material_dark.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2008 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:alpha="@dimen/disabled_alpha_material_dark" + android:color="@color/secondary_text_default_material_dark"/> + <item android:color="@color/secondary_text_default_material_dark"/> +</selector> diff --git a/core/res/res/color/secondary_text_material_light.xml b/core/res/res/color/secondary_text_material_light.xml new file mode 100644 index 0000000..3c354cb --- /dev/null +++ b/core/res/res/color/secondary_text_material_light.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2008 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:alpha="@dimen/disabled_alpha_material_light" + android:color="@color/secondary_text_default_material_light"/> + <item android:color="@color/secondary_text_default_material_light"/> +</selector> |