diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-07 17:49:13 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-07 17:49:13 -0700 |
| commit | 108fd1c08a1a679886c987e1f62a9ba6be962235 (patch) | |
| tree | cd9b93476754596aee887086084b17265afb7f16 /core | |
| parent | 72fe24259537d644102c717867a8c291d122fd06 (diff) | |
| parent | 771afdddc971d193792e2393fc50a142e2af434c (diff) | |
| download | frameworks_base-108fd1c08a1a679886c987e1f62a9ba6be962235.zip frameworks_base-108fd1c08a1a679886c987e1f62a9ba6be962235.tar.gz frameworks_base-108fd1c08a1a679886c987e1f62a9ba6be962235.tar.bz2 | |
Merge change 6435 into donut
* changes:
Add new textColorPrimaryInverseDisableOnly color to resources.
Diffstat (limited to 'core')
| -rw-r--r-- | core/res/res/values/attrs.xml | 3 | ||||
| -rw-r--r-- | core/res/res/values/public.xml | 1 | ||||
| -rw-r--r-- | core/res/res/values/themes.xml | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 10308b6..6f2a5d3 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -68,6 +68,9 @@ <!-- Bright text color. Only differentiates based on the disabled state. --> <attr name="textColorPrimaryDisableOnly" format="reference|color" /> + <!-- Bright inverse text color. Only differentiates based on the disabled state. --> + <attr name="textColorPrimaryInverseDisableOnly" format="reference|color" /> + <!-- Bright text color. This does not differentiate the disabled state. As an example, buttons use this since they display the disabled state via the background and not the foreground text color. --> diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 148935f..32c6937 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -1124,6 +1124,7 @@ <public type="attr" name="progressBarStyleSmallInverse" /> <public type="attr" name="progressBarStyleLargeInverse" /> <public type="attr" name="searchSettingsDescription" /> + <public type="attr" name="textColorPrimaryInverseDisableOnly" /> <public-padding type="attr" name="donut_resource_pad" end="0x0101029f" /> diff --git a/core/res/res/values/themes.xml b/core/res/res/values/themes.xml index bd6e1df..be836eb 100644 --- a/core/res/res/values/themes.xml +++ b/core/res/res/values/themes.xml @@ -44,6 +44,7 @@ <item name="textColorSecondaryInverse">@android:color/secondary_text_light</item> <item name="textColorTertiaryInverse">@android:color/tertiary_text_light</item> <item name="textColorPrimaryDisableOnly">@android:color/primary_text_dark_disable_only</item> + <item name="textColorPrimaryInverseDisableOnly">@android:color/primary_text_light_disable_only</item> <item name="textColorPrimaryNoDisable">@android:color/primary_text_dark_nodisable</item> <item name="textColorSecondaryNoDisable">@android:color/secondary_text_dark_nodisable</item> <item name="textColorPrimaryInverseNoDisable">@android:color/primary_text_light_nodisable</item> @@ -220,6 +221,7 @@ <item name="textColorSecondaryInverse">@android:color/secondary_text_dark</item> <item name="textColorTertiaryInverse">@android:color/tertiary_text_dark</item> <item name="textColorPrimaryDisableOnly">@android:color/primary_text_light_disable_only</item> + <item name="textColorPrimaryInverseDisableOnly">@android:color/primary_text_dark_disable_only</item> <item name="textColorPrimaryNoDisable">@android:color/primary_text_light_nodisable</item> <item name="textColorSecondaryNoDisable">@android:color/secondary_text_light_nodisable</item> <item name="textColorPrimaryInverseNoDisable">@android:color/primary_text_dark_nodisable</item> |