Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am a5a9c6e0: Merge "Rename StatusBar.Material styles to Material.Notification" into lmp-dev

Browse Source 
* commit 'a5a9c6e03b11d502c0b1e845611aad0171e51d9f':
  Rename StatusBar.Material styles to Material.Notification
This commit is contained in:
Alan Viverette
2014-08-28 18:15:55 +00:00
committed by Android Git Automerger
parent 0a0740b9f9 b712458362
commit e454802769
17 changed files with 57 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
api/current.txt
View File

@@ -2025,6 +2025,12 @@ package android {
field public static final int TextAppearance_Material_Medium = 16974355; // 0x1030213
field public static final int TextAppearance_Material_Medium_Inverse = 16974356; // 0x1030214
field public static final int TextAppearance_Material_Menu = 16974554; // 0x10302da
field public static final int TextAppearance_Material_Notification = 16974560; // 0x10302e0
field public static final int TextAppearance_Material_Notification_Emphasis = 16974565; // 0x10302e5
field public static final int TextAppearance_Material_Notification_Info = 16974563; // 0x10302e3
field public static final int TextAppearance_Material_Notification_Line2 = 16974562; // 0x10302e2
field public static final int TextAppearance_Material_Notification_Time = 16974564; // 0x10302e4
field public static final int TextAppearance_Material_Notification_Title = 16974561; // 0x10302e1
field public static final int TextAppearance_Material_SearchResult_Subtitle = 16974357; // 0x1030215
field public static final int TextAppearance_Material_SearchResult_Title = 16974358; // 0x1030216
field public static final int TextAppearance_Material_Small = 16974359; // 0x1030217
@@ -2063,13 +2069,6 @@ package android {
field public static final int TextAppearance_StatusBar_EventContent = 16973927; // 0x1030067
field public static final int TextAppearance_StatusBar_EventContent_Title = 16973928; // 0x1030068
field public static final int TextAppearance_StatusBar_Icon = 16973926; // 0x1030066
field public static final int TextAppearance_StatusBar_Material = 16974559; // 0x10302df
field public static final int TextAppearance_StatusBar_Material_EventContent = 16974560; // 0x10302e0
field public static final int TextAppearance_StatusBar_Material_EventContent_Emphasis = 16974565; // 0x10302e5
field public static final int TextAppearance_StatusBar_Material_EventContent_Info = 16974563; // 0x10302e3
field public static final int TextAppearance_StatusBar_Material_EventContent_Line2 = 16974562; // 0x10302e2
field public static final int TextAppearance_StatusBar_Material_EventContent_Time = 16974564; // 0x10302e4
field public static final int TextAppearance_StatusBar_Material_EventContent_Title = 16974561; // 0x10302e1
field public static final int TextAppearance_StatusBar_Title = 16973925; // 0x1030065
field public static final int TextAppearance_SuggestionHighlight = 16974104; // 0x1030118
field public static final int TextAppearance_Theme = 16973888; // 0x1030040
@@ -2628,6 +2627,7 @@ package android {
field public static final int Widget_Toolbar = 16974339; // 0x1030203
field public static final int Widget_Toolbar_Button_Navigation = 16974340; // 0x1030204
field public static final int Widget_WebView = 16973875; // 0x1030033
field public static final int __removed = 16974559; // 0x10302df
field public static final int l_resource_pad1 = 16974336; // 0x1030200
field public static final int l_resource_pad10 = 16974327; // 0x10301f7
field public static final int l_resource_pad11 = 16974326; // 0x10301f6

2
core/res/res/layout/notification_template_material_big_base.xml
View File

@@ -45,7 +45,7 @@
android:gravity="top"
>
<TextView android:id="@+id/big_text"
android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent"
android:textAppearance="@style/TextAppearance.Material.Notification"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"

12
core/res/res/layout/notification_template_material_big_media.xml
View File

@@ -49,7 +49,7 @@
android:orientation="horizontal"
>
<TextView android:id="@+id/title"
android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent.Title"
android:textAppearance="@style/TextAppearance.Material.Notification.Title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:singleLine="true"
@@ -73,7 +73,7 @@
/>
</LinearLayout>
<TextView android:id="@+id/text2"
android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent.Line2"
android:textAppearance="@style/TextAppearance.Material.Notification.Line2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="-2dp"
@@ -86,7 +86,7 @@
android:visibility="gone"
/>
<TextView android:id="@+id/big_text"
android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent"
android:textAppearance="@style/TextAppearance.Material.Notification"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
@@ -104,7 +104,7 @@
android:gravity="center_vertical"
>
<TextView android:id="@+id/text"
android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent"
android:textAppearance="@style/TextAppearance.Material.Notification"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
@@ -114,7 +114,7 @@
android:fadingEdge="horizontal"
/>
<TextView android:id="@+id/info"
android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent.Info"
android:textAppearance="@style/TextAppearance.Material.Notification.Info"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
@@ -146,7 +146,7 @@
android:layout_height="6dp"
android:layout_gravity="top"
android:visibility="gone"
style="@style/Widget.StatusBar.Material.ProgressBar.Media"
style="@style/Widget.Material.Notification.ProgressBar.Media"
/>
</FrameLayout>
</LinearLayout>

2
core/res/res/layout/notification_template_material_big_text.xml
View File

@@ -46,7 +46,7 @@
android:gravity="top"
>
<TextView android:id="@+id/big_text"
android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent"
android:textAppearance="@style/TextAppearance.Material.Notification"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"

16
core/res/res/layout/notification_template_material_inbox.xml
View File

@@ -50,7 +50,7 @@
android:orientation="vertical"
>
<TextView android:id="@+id/inbox_text0"
android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent"
android:textAppearance="@style/TextAppearance.Material.Notification"
android:layout_width="match_parent"
android:layout_height="0dp"
android:singleLine="true"
@@ -59,7 +59,7 @@
android:layout_weight="1"
/>
<TextView android:id="@+id/inbox_text1"
android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent"
android:textAppearance="@style/TextAppearance.Material.Notification"
android:layout_width="match_parent"
android:layout_height="0dp"
android:singleLine="true"
@@ -68,7 +68,7 @@
android:layout_weight="1"
/>
<TextView android:id="@+id/inbox_text2"
android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent"
android:textAppearance="@style/TextAppearance.Material.Notification"
android:layout_width="match_parent"
android:layout_height="0dp"
android:singleLine="true"
@@ -77,7 +77,7 @@
android:layout_weight="1"
/>
<TextView android:id="@+id/inbox_text3"
android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent"
android:textAppearance="@style/TextAppearance.Material.Notification"
android:layout_width="match_parent"
android:layout_height="0dp"
android:singleLine="true"
@@ -86,7 +86,7 @@
android:layout_weight="1"
/>
<TextView android:id="@+id/inbox_text4"
android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent"
android:textAppearance="@style/TextAppearance.Material.Notification"
android:layout_width="match_parent"
android:layout_height="0dp"
android:singleLine="true"
@@ -95,7 +95,7 @@
android:layout_weight="1"
/>
<TextView android:id="@+id/inbox_text5"
android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent"
android:textAppearance="@style/TextAppearance.Material.Notification"
android:layout_width="match_parent"
android:layout_height="0dp"
android:singleLine="true"
@@ -104,7 +104,7 @@
android:layout_weight="1"
/>
<TextView android:id="@+id/inbox_text6"
android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent"
android:textAppearance="@style/TextAppearance.Material.Notification"
android:layout_width="match_parent"
android:layout_height="0dp"
android:singleLine="true"
@@ -113,7 +113,7 @@
android:layout_weight="1"
/>
<TextView android:id="@+id/inbox_more"
android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent"
android:textAppearance="@style/TextAppearance.Material.Notification"
android:layout_width="match_parent"
android:layout_height="0dp"
android:singleLine="true"

10
core/res/res/layout/notification_template_material_media.xml
View File

@@ -50,7 +50,7 @@
android:orientation="horizontal"
>
<TextView android:id="@+id/title"
android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent.Title"
android:textAppearance="@style/TextAppearance.Material.Notification.Title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:singleLine="true"
@@ -74,7 +74,7 @@
/>
</LinearLayout>
<TextView android:id="@+id/text2"
android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent.Line2"
android:textAppearance="@style/TextAppearance.Material.Notification.Line2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="-2dp"
@@ -91,7 +91,7 @@
android:layout_height="12dp"
android:layout_marginStart="8dp"
android:visibility="gone"
style="@style/Widget.StatusBar.Material.ProgressBar"
style="@style/Widget.Material.Notification.ProgressBar"
/>
<LinearLayout
android:id="@+id/line3"
@@ -102,7 +102,7 @@
android:layout_marginStart="8dp"
>
<TextView android:id="@+id/text"
android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent"
android:textAppearance="@style/TextAppearance.Material.Notification"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
@@ -112,7 +112,7 @@
android:fadingEdge="horizontal"
/>
<TextView android:id="@+id/info"
android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent.Info"
android:textAppearance="@style/TextAppearance.Material.Notification.Info"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"

2
core/res/res/layout/notification_template_part_chronometer.xml
View File

@@ -15,7 +15,7 @@
-->
<Chronometer android:id="@+id/chronometer" xmlns:android="http://schemas.android.com/apk/res/android"
android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent.Time"
android:textAppearance="@style/TextAppearance.Material.Notification.Time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"

2
core/res/res/layout/notification_template_part_line1.xml
View File

@@ -23,7 +23,7 @@
android:orientation="horizontal"
>
<TextView android:id="@+id/title"
android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent.Title"
android:textAppearance="@style/TextAppearance.Material.Notification.Title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:singleLine="true"

2
core/res/res/layout/notification_template_part_line2.xml
View File

@@ -27,7 +27,7 @@
>
<TextView
android:id="@+id/text2"
android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent.Line2"
android:textAppearance="@style/TextAppearance.Material.Notification.Line2"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="-1dp"

4
core/res/res/layout/notification_template_part_line3.xml
View File

@@ -24,7 +24,7 @@
android:gravity="center_vertical"
>
<TextView android:id="@+id/text"
android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent"
android:textAppearance="@style/TextAppearance.Material.Notification"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
@@ -34,7 +34,7 @@
android:fadingEdge="horizontal"
/>
<TextView android:id="@+id/info"
android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent.Info"
android:textAppearance="@style/TextAppearance.Material.Notification.Info"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"

2
core/res/res/layout/notification_template_part_time.xml
View File

@@ -15,7 +15,7 @@
-->
<DateTimeView android:id="@+id/time" xmlns:android="http://schemas.android.com/apk/res/android"
android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent.Time"
android:textAppearance="@style/TextAppearance.Material.Notification.Time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"

14
core/res/res/values/public.xml
View File

@@ -2527,13 +2527,13 @@
<public type="style" name="Theme.Leanback.FormWizard"/>
<public type="style" name="TextAppearance.StatusBar.Material" />
<public type="style" name="TextAppearance.StatusBar.Material.EventContent" />
<public type="style" name="TextAppearance.StatusBar.Material.EventContent.Title" />
<public type="style" name="TextAppearance.StatusBar.Material.EventContent.Line2" />
<public type="style" name="TextAppearance.StatusBar.Material.EventContent.Info" />
<public type="style" name="TextAppearance.StatusBar.Material.EventContent.Time" />
<public type="style" name="TextAppearance.StatusBar.Material.EventContent.Emphasis" />
<public type="style" name="__removed" />
<public type="style" name="TextAppearance.Material.Notification" />
<public type="style" name="TextAppearance.Material.Notification.Title" />
<public type="style" name="TextAppearance.Material.Notification.Line2" />
<public type="style" name="TextAppearance.Material.Notification.Info" />
<public type="style" name="TextAppearance.Material.Notification.Time" />
<public type="style" name="TextAppearance.Material.Notification.Emphasis" />
<public type="style" name="Widget.Material.Spinner.Underlined" />
<public type="style" name="Widget.Material.Light.Spinner.Underlined" />

18
core/res/res/values/styles_material.xml
View File

@@ -410,37 +410,35 @@ please see styles_device_defaults.xml.
<item name="textSize">@dimen/datepicker_year_label_text_size</item>
</style>
<style name="TextAppearance.StatusBar.Material" />
<style name="TextAppearance.StatusBar.Material.EventContent">
<style name="TextAppearance.Material.Notification">
<item name="textColor">@color/secondary_text_material_light</item>
<item name="textSize">@dimen/notification_text_size</item>
</style>
<style name="TextAppearance.StatusBar.Material.EventContent.Title">
<style name="TextAppearance.Material.Notification.Title">
<item name="textColor">@color/primary_text_default_material_light</item>
<item name="textSize">@dimen/notification_title_text_size</item>
</style>
<style name="TextAppearance.StatusBar.Material.EventContent.Line2">
<style name="TextAppearance.Material.Notification.Line2">
<item name="textSize">@dimen/notification_subtext_size</item>
</style>
<style name="TextAppearance.StatusBar.Material.EventContent.Info">
<style name="TextAppearance.Material.Notification.Info">
<item name="textSize">@dimen/notification_subtext_size</item>
</style>
<style name="TextAppearance.StatusBar.Material.EventContent.Time">
<style name="TextAppearance.Material.Notification.Time">
<item name="textSize">@dimen/notification_subtext_size</item>
</style>
<style name="TextAppearance.StatusBar.Material.EventContent.Emphasis">
<style name="TextAppearance.Material.Notification.Emphasis">
<item name="textColor">#66000000</item>
</style>
<style name="Widget.StatusBar.Material.ProgressBar" parent="Widget.Material.Light.ProgressBar.Horizontal" />
<style name="Widget.Material.Notification.ProgressBar" parent="Widget.Material.Light.ProgressBar.Horizontal" />
<style name="Widget.StatusBar.Material.ProgressBar.Media">
<style name="Widget.Material.Notification.ProgressBar.Media">
<item name="progressDrawable">@drawable/notification_material_media_progress</item>
</style>

2
core/res/res/values/themes_material.xml
View File

@@ -1257,4 +1257,6 @@ please see themes_device_defaults.xml.
<item name="colorAccent">@color/material_deep_teal_500</item>
</style>
<!-- TODO: Spacer to be removed from here and public.xml -->
<style name="__removed" />
</resources>

6
packages/SystemUI/res/layout/notification_guts.xml
View File

@@ -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"

4
packages/SystemUI/res/values/styles.xml
View File

@@ -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>

2
packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
View File

@@ -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,