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

Commit 9a990c79 authored by Daniel Sandler's avatar Daniel Sandler Committed by Android Git Automerger
Browse files

am 7362e0d8: Merge "Adjust text sizes for better behavior under user scaling." into ics-mr0 

* commit '7362e0d8':
  Adjust text sizes for better behavior under user scaling.
parents cf774c34 7362e0d8

packages/SystemUI/res/layout/status_bar.xml

+3 −4
Original line number Original line Diff line number Diff line
@@ -77,7 +77,6 @@ 
            android:layout_height="match_parent"

            android:layout_height="match_parent"

            android:singleLine="true"

            android:singleLine="true"

            android:paddingRight="6dip"

            android:paddingRight="6dip"

            android:textSize="16sp"

            android:gravity="center_vertical|left"

            android:gravity="center_vertical|left"

            />

            />

    </LinearLayout>

    </LinearLayout>
@@ -91,7 +90,7 @@ 
        <ImageSwitcher android:id="@+id/tickerIcon"

        <ImageSwitcher android:id="@+id/tickerIcon"

            android:layout_width="@dimen/status_bar_icon_size"

            android:layout_width="@dimen/status_bar_icon_size"

            android:layout_height="@dimen/status_bar_icon_size"

            android:layout_height="@dimen/status_bar_icon_size"

            android:layout_marginRight="2dip"

            android:layout_marginRight="4dip"

            >

            >

            <com.android.systemui.statusbar.AnimatedImageView

            <com.android.systemui.statusbar.AnimatedImageView

                android:layout_width="@dimen/status_bar_icon_size"

                android:layout_width="@dimen/status_bar_icon_size"
@@ -111,13 +110,13 @@ 
            android:paddingTop="2dip"

            android:paddingTop="2dip"

            android:paddingRight="10dip">

            android:paddingRight="10dip">

            <TextView

            <TextView

                android:textAppearance="@*android:style/TextAppearance.StatusBar.Ticker"

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

                android:layout_width="match_parent"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_height="wrap_content"

                android:singleLine="true"

                android:singleLine="true"

                />

                />

            <TextView

            <TextView

                android:textAppearance="@*android:style/TextAppearance.StatusBar.Ticker"

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

                android:layout_width="match_parent"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_height="wrap_content"

                android:singleLine="true"

                android:singleLine="true"

packages/SystemUI/res/layout/status_bar_expanded.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -35,7 +35,7 @@ 
        android:background="@drawable/notification_header_bg"

        android:background="@drawable/notification_header_bg"

        >

        >

        <com.android.systemui.statusbar.policy.DateView android:id="@+id/date"

        <com.android.systemui.statusbar.policy.DateView android:id="@+id/date"

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

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

            android:layout_width="wrap_content"

            android:layout_width="wrap_content"

            android:layout_height="match_parent"

            android:layout_height="match_parent"

            android:layout_alignParentLeft="true"

            android:layout_alignParentLeft="true"

packages/SystemUI/res/values/styles.xml

+13 −0
Original line number Original line Diff line number Diff line
@@ -41,6 +41,13 @@ 
    </style>

    </style>





    <style name="TextAppearance.StatusBar.Clock" parent="@*android:style/TextAppearance.StatusBar.Icon">

    <style name="TextAppearance.StatusBar.Clock" parent="@*android:style/TextAppearance.StatusBar.Icon">

        <!-- Note: must be dp to fit in status bar -->

        <item name="android:textSize">16dp</item>

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

        <item name="android:textColor">@android:color/holo_blue_light</item>

    </style>



    <style name="TextAppearance.StatusBar.Date" parent="@*android:style/TextAppearance.StatusBar.Icon">

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

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

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

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

        <item name="android:textColor">@android:color/holo_blue_light</item>

        <item name="android:textColor">@android:color/holo_blue_light</item>
@@ -69,4 +76,10 @@ 
        <item name="android:windowExitAnimation">@anim/priority_alert_exit</item>

        <item name="android:windowExitAnimation">@anim/priority_alert_exit</item>

    </style>

    </style>





    <style name="TextAppearance.StatusBar.PhoneTicker"

        parent="@*android:style/TextAppearance.StatusBar.Ticker">

        <!-- Note: must be dp to fit in status bar -->

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

    </style>

    

</resources>
 
</resources>