summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-07-07 17:51:16 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-07-07 17:51:16 -0700
commita3d595e1a67506bfd86298516a95ee75f8a0d5d2 (patch)
treebc8f978c3bb74e4e28b8b9237c7348f5a4eac926 /api
parent797c39090f37ecdd227390fed6717664d65bd3ae (diff)
parent108fd1c08a1a679886c987e1f62a9ba6be962235 (diff)
downloadframeworks_base-a3d595e1a67506bfd86298516a95ee75f8a0d5d2.zip
frameworks_base-a3d595e1a67506bfd86298516a95ee75f8a0d5d2.tar.gz
frameworks_base-a3d595e1a67506bfd86298516a95ee75f8a0d5d2.tar.bz2
am 108fd1c0: Merge change 6435 into donut
Merge commit '108fd1c08a1a679886c987e1f62a9ba6be962235' * commit '108fd1c08a1a679886c987e1f62a9ba6be962235': Add new textColorPrimaryInverseDisableOnly color to resources.
Diffstat (limited to 'api')
-rw-r--r--api/current.xml22
1 files changed, 11 insertions, 11 deletions
diff --git a/api/current.xml b/api/current.xml
index ecde4c6..6debbac 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -3474,17 +3474,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"
@@ -8490,6 +8479,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"