diff options
| author | Alan Viverette <alanv@google.com> | 2014-08-28 18:13:20 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-28 18:13:21 +0000 |
| commit | b712458362af70b93c144f614602fd80b063d191 (patch) | |
| tree | 75882adc8d07aebe7a128cc99f908545148a9d8d /packages/SystemUI | |
| parent | de18420afff5ae606dd5adbe2a7ab3c52c61ff39 (diff) | |
| parent | 41ad39421dabc86199540e6750d5fae34fade493 (diff) | |
| download | frameworks_base-b712458362af70b93c144f614602fd80b063d191.zip frameworks_base-b712458362af70b93c144f614602fd80b063d191.tar.gz frameworks_base-b712458362af70b93c144f614602fd80b063d191.tar.bz2 | |
Merge "Rename StatusBar.Material styles to Material.Notification" into lmp-dev
Diffstat (limited to 'packages/SystemUI')
| -rw-r--r-- | packages/SystemUI/res/layout/notification_guts.xml | 6 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/styles.xml | 4 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/packages/SystemUI/res/layout/notification_guts.xml b/packages/SystemUI/res/layout/notification_guts.xml index d65a23e..566c304 100644 --- a/packages/SystemUI/res/layout/notification_guts.xml +++ b/packages/SystemUI/res/layout/notification_guts.xml @@ -53,7 +53,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical|start" android:layout_weight="1" - android:textAppearance="@*android:style/TextAppearance.StatusBar.Material.EventContent.Title" + android:textAppearance="@*android:style/TextAppearance.Material.Notification.Title" android:textColor="@color/notification_guts_title_color" /> <DateTimeView @@ -62,7 +62,7 @@ android:layout_height="wrap_content" android:layout_weight="0" android:layout_gravity="center_vertical|start" - android:textAppearance="@*android:style/TextAppearance.StatusBar.Material.EventContent.Time" + android:textAppearance="@*android:style/TextAppearance.Material.Notification.Time" android:textColor="@color/notification_guts_text_color" /> <TextView @@ -70,7 +70,7 @@ android:layout_height="wrap_content" android:id="@+id/debug_info" android:layout_weight="0" - android:textAppearance="@*android:style/TextAppearance.StatusBar.Material.EventContent.Time" + android:textAppearance="@*android:style/TextAppearance.Material.Notification.Time" android:layout_gravity="bottom|start" android:visibility="gone" android:textColor="@color/notification_guts_text_color" diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index d236c7e..efd4fb4 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -234,8 +234,8 @@ <item name="android:windowExitAnimation">@*android:anim/popup_exit_material</item> </style> - <style name="TextAppearance.StatusBar.Material.EventContent.Parenthetical" - parent="@*android:style/TextAppearance.StatusBar.Material.EventContent"> + <style name="TextAppearance.Material.Notification.Parenthetical" + parent="@*android:style/TextAppearance.Material.Notification"> <item name="android:textStyle">italic</item> <item name="android:textColor">#60000000</item> </style> diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java index 35ed3e5..da99118 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java @@ -1232,7 +1232,7 @@ public abstract class BaseStatusBar extends SystemUI implements if (text != null) { text.setText(R.string.notification_hidden_text); text.setTextAppearance(mContext, - R.style.TextAppearance_StatusBar_Material_EventContent_Parenthetical); + R.style.TextAppearance_Material_Notification_Parenthetical); } int topPadding = Notification.Builder.calculateTopPadding(mContext, |