summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2011-06-07 11:36:32 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-06-07 11:36:32 -0700
commita7d01a75190abbb4b3f47d15c86421bd19c11fc2 (patch)
tree39ebd724ed14de143ddde2d3ae70c6f76e48974b
parent7f13d0ed408c3ddce5b061c4370d99ba15d027b7 (diff)
parent212d15c746f2611339026c16e5fa1aeb7f9090b7 (diff)
downloadframeworks_base-a7d01a75190abbb4b3f47d15c86421bd19c11fc2.zip
frameworks_base-a7d01a75190abbb4b3f47d15c86421bd19c11fc2.tar.gz
frameworks_base-a7d01a75190abbb4b3f47d15c86421bd19c11fc2.tar.bz2
am 212d15c7: am a476813d: Make Theme.Holo.Light.NoActionBar and Theme.Holo.Light.NoActionBar.Fullscreen public.
* commit '212d15c746f2611339026c16e5fa1aeb7f9090b7': Make Theme.Holo.Light.NoActionBar and Theme.Holo.Light.NoActionBar.Fullscreen public.
-rw-r--r--api/current.xml24
-rw-r--r--core/res/res/values/public.xml4
2 files changed, 27 insertions, 1 deletions
diff --git a/api/current.xml b/api/current.xml
index cabd07d3..8808ea5 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -15714,6 +15714,28 @@
visibility="public"
>
</field>
+<field name="Theme_Holo_Light_NoActionBar"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="16974064"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="Theme_Holo_Light_NoActionBar_Fullscreen"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="16974065"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
<field name="Theme_Holo_Light_Panel"
type="int"
transient="false"
@@ -267753,7 +267775,7 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="arg0" type="T">
+<parameter name="t" type="T">
</parameter>
</method>
</interface>
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index 85884b1..47b5c60 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -1657,4 +1657,8 @@
<public type="attr" name="requiresSmallestWidthDp" id="0x01010364" />
<public type="attr" name="compatibleWidthLimitDp" />
<public type="attr" name="largestWidthLimitDp" />
+
+ <public type="style" name="Theme.Holo.Light.NoActionBar" />
+ <public type="style" name="Theme.Holo.Light.NoActionBar.Fullscreen" />
+
</resources>