diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-06-10 12:45:36 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2011-06-10 12:45:36 -0700 |
| commit | 6b592723c9a9fc816a8ab75c935e8cd20ff65a0e (patch) | |
| tree | 00b93945a1c8051172316575208f14c355e663c3 /packages | |
| parent | 08b992c88e60a95b629a70cd197b3d3b9b27fb8d (diff) | |
| parent | f51ded0f8f593d17af82946eb65c05fc04f688b4 (diff) | |
| download | frameworks_base-6b592723c9a9fc816a8ab75c935e8cd20ff65a0e.zip frameworks_base-6b592723c9a9fc816a8ab75c935e8cd20ff65a0e.tar.gz frameworks_base-6b592723c9a9fc816a8ab75c935e8cd20ff65a0e.tar.bz2 | |
resolved conflicts for merge of f51ded0f to master
Change-Id: Ida356524a68aeb2b9b0013dfbb6ab4bd11e616e2
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/res/values/styles.xml | 8 |
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> |