summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2011-06-09 16:02:02 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-06-09 16:02:02 -0700
commita8d7ea067cf22baeee2ff0a33e5a8c5a35936942 (patch)
tree9f4f48ddce8c838c2807c49712c7ae3aaea050b7 /packages
parent75749ab1a03f5b4a9f1aaee64dd1c6f36e22dc22 (diff)
parent220cd77de62956eb76c5084e1d1341d69bfd214a (diff)
downloadframeworks_base-a8d7ea067cf22baeee2ff0a33e5a8c5a35936942.zip
frameworks_base-a8d7ea067cf22baeee2ff0a33e5a8c5a35936942.tar.gz
frameworks_base-a8d7ea067cf22baeee2ff0a33e5a8c5a35936942.tar.bz2
am 220cd77d: Merge "Enforce public resource restriction on bag parents." into honeycomb-mr2
* commit '220cd77de62956eb76c5084e1d1341d69bfd214a': Enforce public resource restriction on bag parents.
Diffstat (limited to 'packages')
-rw-r--r--packages/SystemUI/res/values/styles.xml8
1 files changed, 4 insertions, 4 deletions
diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
index 86ffb4d..91a8855 100644
--- a/packages/SystemUI/res/values/styles.xml
+++ b/packages/SystemUI/res/values/styles.xml
@@ -16,25 +16,25 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android">
- <style name="TextAppearance.StatusBar.Title" parent="@android:style/TextAppearance.StatusBar">
+ <style name="TextAppearance.StatusBar.Title" parent="@*android:style/TextAppearance.StatusBar">
<item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
<item name="android:textStyle">bold</item>
<item name="android:textColor">?android:attr/textColorPrimary</item>
</style>
<style name="TextAppearance.StatusBar.IntruderAlert"
- parent="@android:style/TextAppearance.StatusBar">
+ parent="@*android:style/TextAppearance.StatusBar">
</style>
<style name="TextAppearance.StatusBar.SystemPanel"
- parent="@android:style/TextAppearance.StatusBar">
+ parent="@*android:style/TextAppearance.StatusBar">
<item name="android:textAppearance">?android:attr/textAppearance</item>
<item name="android:textStyle">normal</item>
<item name="android:textColor">#FF808080</item>
</style>
<style name="TextAppearance.StatusBar.TextButton"
- parent="@android:style/TextAppearance.StatusBar">
+ parent="@*android:style/TextAppearance.StatusBar">
<item name="android:textAppearance">?android:attr/textAppearance</item>
<item name="android:textStyle">normal</item>
<item name="android:textColor">#FFFFFFFF</item>