Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7124583 authored by Alan Viverette's avatar Alan Viverette Committed by Android (Google) Code Review
Browse files

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

parents de18420a 41ad3942

api/current.txt

+7 −7
Original line number Diff line number Diff line
@@ -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

core/res/res/layout/notification_template_material_big_base.xml

+1 −1
Original line number Diff line number Diff line
@@ -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"

core/res/res/layout/notification_template_material_big_media.xml

+6 −6
Original line number Diff line number Diff line
@@ -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>

core/res/res/layout/notification_template_material_big_text.xml

+1 −1
Original line number Diff line number Diff line
@@ -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"

core/res/res/layout/notification_template_material_inbox.xml

+8 −8
Original line number Diff line number Diff line
@@ -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"