summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Guy <romainguy@android.com>2009-07-07 17:35:34 -0700
committerRomain Guy <romainguy@android.com>2009-07-07 17:35:34 -0700
commit771afdddc971d193792e2393fc50a142e2af434c (patch)
tree8a4c472ad3934e2ea476aec5c71a78e972ff845a
parent86ea435a40c5ffa9a03dc0ac9536378a33c9e5b4 (diff)
downloadframeworks_base-771afdddc971d193792e2393fc50a142e2af434c.zip
frameworks_base-771afdddc971d193792e2393fc50a142e2af434c.tar.gz
frameworks_base-771afdddc971d193792e2393fc50a142e2af434c.tar.bz2
Add new textColorPrimaryInverseDisableOnly color to resources.
-rw-r--r--api/current.xml22
-rw-r--r--core/res/res/values/attrs.xml3
-rw-r--r--core/res/res/values/public.xml1
-rw-r--r--core/res/res/values/themes.xml2
4 files changed, 17 insertions, 11 deletions
diff --git a/api/current.xml b/api/current.xml
index 9bce1f3..78562f0 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -3397,17 +3397,6 @@
visibility="public"
>
</field>
-<field name="donut_resource_pad21"
- type="int"
- transient="false"
- volatile="false"
- value="16843403"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
<field name="donut_resource_pad3"
type="int"
transient="false"
@@ -8413,6 +8402,17 @@
visibility="public"
>
</field>
+<field name="textColorPrimaryInverseDisableOnly"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="16843403"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
<field name="textColorPrimaryInverseNoDisable"
type="int"
transient="false"
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>