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

Commit 20af1c57 authored by Justin Ho's avatar Justin Ho Committed by Android (Google) Code Review
Browse files

Merge "Correct font size for notifications & control panel." into honeycomb

parents 9eaefb82 ca05585f

core/res/res/layout-xlarge/status_bar_latest_event_content.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -23,14 +23,14 @@ 
            android:singleLine="true"

            android:singleLine="true"

            android:ellipsize="marquee"

            android:ellipsize="marquee"

            android:fadingEdge="horizontal"

            android:fadingEdge="horizontal"

            android:layout_marginBottom="-4dp"

            android:layout_marginBottom="-3dp"

            />

            />

        <TextView android:id="@+id/text"

        <TextView android:id="@+id/text"

            android:textAppearance="@style/TextAppearance.StatusBar.EventContent"

            android:textAppearance="@style/TextAppearance.StatusBar.EventContent"

            android:layout_width="match_parent"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:layout_weight="1"

            android:layout_marginTop="-4dp"

            android:layout_marginTop="-2dp"

            android:singleLine="true"

            android:singleLine="true"

            android:ellipsize="marquee"

            android:ellipsize="marquee"

            android:fadingEdge="horizontal"

            android:fadingEdge="horizontal"

core/res/res/layout-xlarge/status_bar_latest_event_content_large_icon.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -17,14 +17,14 @@ 
            android:singleLine="true"

            android:singleLine="true"

            android:ellipsize="marquee"

            android:ellipsize="marquee"

            android:fadingEdge="horizontal"

            android:fadingEdge="horizontal"

            android:layout_marginBottom="-4dp"

            android:layout_marginBottom="-3dp"

            />

            />

        <TextView android:id="@+id/text"

        <TextView android:id="@+id/text"

            android:textAppearance="@style/TextAppearance.StatusBar.EventContent"

            android:textAppearance="@style/TextAppearance.StatusBar.EventContent"

            android:layout_width="match_parent"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:layout_weight="1"

            android:layout_marginTop="-4dp"

            android:layout_marginTop="-2dp"

            android:singleLine="true"

            android:singleLine="true"

            android:ellipsize="marquee"

            android:ellipsize="marquee"

            android:fadingEdge="horizontal"

            android:fadingEdge="horizontal"

core/res/res/values-xlarge/styles.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -30,6 +30,7 @@ 
    </style>

    </style>

    <style name="TextAppearance.StatusBar.EventContent">

    <style name="TextAppearance.StatusBar.EventContent">

        <item name="android:textColor">#ff999999</item>

        <item name="android:textColor">#ff999999</item>

        <item name="android:textSize">14sp</item>

    </style>

    </style>

    <style name="TextAppearance.StatusBar.EventContent.Title">

    <style name="TextAppearance.StatusBar.EventContent.Title">

        <item name="android:textColor">?android:attr/textColorPrimary</item>

        <item name="android:textColor">?android:attr/textColorPrimary</item>

core/res/res/values/styles.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -224,7 +224,7 @@ 
        <item name="android:textStyle">bold</item>

        <item name="android:textStyle">bold</item>

    </style>

    </style>

    <style name="TextAppearance.StatusBar.EventContent">

    <style name="TextAppearance.StatusBar.EventContent">

        <item name="android:textSize">10sp</item>

        <item name="android:textAppearance">?android:attr/textAppearanceSmall</item>

        <item name="android:textColor">?android:attr/textColorPrimaryInverse</item>

        <item name="android:textColor">?android:attr/textColorPrimaryInverse</item>

    </style>

    </style>

    <style name="TextAppearance.StatusBar.EventContent.Title">

    <style name="TextAppearance.StatusBar.EventContent.Title">

packages/SystemUI/res/values-xlarge/styles.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -39,6 +39,7 @@ 
        <item name="android:layout_weight">1</item>

        <item name="android:layout_weight">1</item>

        <item name="android:layout_gravity">left|center_vertical</item>

        <item name="android:layout_gravity">left|center_vertical</item>

        <item name="android:textColor">?android:attr/textColorPrimary</item>

        <item name="android:textColor">?android:attr/textColorPrimary</item>

        <item name="android:textSize">18sp</item>

    </style>

    </style>





    <style name="StatusBarPanelSettingsPanelSeparator">

    <style name="StatusBarPanelSettingsPanelSeparator">