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

Commit b1cb75a5 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov Committed by Automerger Merge Worker
Browse files

Merge "Revert "fix(non linear font scaling): fix status bar ui broken when... 

Merge "Revert "fix(non linear font scaling): fix status bar ui broken when 200% font scaling"" into udc-dev am: b26d3a55

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22956848



Change-Id: I743d2f2b7c52072ba5a2f8ab98cea7cb2c46721b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 44c118e1 b26d3a55

core/res/res/values/dimens.xml

+4 −4
Original line number Diff line number Diff line
@@ -96,12 +96,12 @@ 
    <!-- Width of the navigation bar when it is placed vertically on the screen in car mode -->

    <dimen name="navigation_bar_width_car_mode">96dp</dimen>

    <!-- Height of notification icons in the status bar -->

    <dimen name="status_bar_icon_size">18sp</dimen>

    <dimen name="status_bar_icon_size">22dip</dimen>

    <!-- Desired size of system icons in status bar. -->

    <dimen name="status_bar_system_icon_size">15sp</dimen>

    <dimen name="status_bar_system_icon_size">15dp</dimen>

    <!-- Intrinsic size of most system icons in status bar. This is the default value that

         is used if a Drawable reports an intrinsic size of 0. -->

    <dimen name="status_bar_system_icon_intrinsic_size">17sp</dimen>

    <dimen name="status_bar_system_icon_intrinsic_size">17dp</dimen>

    <!-- Size of the giant number (unread count) in the notifications -->

    <dimen name="status_bar_content_number_size">48sp</dimen>

    <!-- Margin at the edge of the screen to ignore touch events for in the windowshade. -->
@@ -330,7 +330,7 @@ 
    <dimen name="notification_icon_circle_start">16dp</dimen>



    <!-- size (width and height) of the icon in the notification header -->

    <dimen name="notification_header_icon_size_ambient">18sp</dimen>

    <dimen name="notification_header_icon_size_ambient">18dp</dimen>



    <!-- The margin before the start of the app name in the header. -->

    <dimen name="notification_header_app_name_margin_start">3dp</dimen>

packages/SystemUI/res-keyguard/layout/status_bar_mobile_signal_group_inner.xml

+10 −11
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 


        <FrameLayout

            android:id="@+id/inout_container"

            android:layout_height="@*android:dimen/status_bar_system_icon_intrinsic_size"

            android:layout_height="17dp"

            android:layout_width="wrap_content"

            android:layout_gravity="center_vertical">

            <ImageView
@@ -39,25 +39,24 @@ 
                android:layout_width="wrap_content"

                android:src="@drawable/ic_activity_down"

                android:visibility="gone"

                android:paddingEnd="2sp"

                android:paddingEnd="2dp"

                />

            <ImageView

                android:id="@+id/mobile_out"

                android:layout_height="wrap_content"

                android:layout_width="wrap_content"

                android:src="@drawable/ic_activity_up"

                android:paddingEnd="2sp"

                android:paddingEnd="2dp"

                android:visibility="gone"

                />

        </FrameLayout>

        <ImageView

            android:id="@+id/mobile_type"

            android:layout_height="@dimen/status_bar_mobile_signal_size"

            android:layout_height="wrap_content"

            android:layout_width="wrap_content"

            android:layout_gravity="center_vertical"

            android:adjustViewBounds="true"

            android:paddingStart="2.5sp"

            android:paddingEnd="1sp"

            android:paddingStart="2.5dp"

            android:paddingEnd="1dp"

            android:visibility="gone" />

        <Space

            android:id="@+id/mobile_roaming_space"
@@ -71,14 +70,14 @@ 
            android:layout_gravity="center_vertical">

            <com.android.systemui.statusbar.AnimatedImageView

                android:id="@+id/mobile_signal"

                android:layout_height="@dimen/status_bar_mobile_signal_size"

                android:layout_width="@dimen/status_bar_mobile_signal_size"

                android:layout_height="wrap_content"

                android:layout_width="wrap_content"

                systemui:hasOverlappingRendering="false"

                />

            <ImageView

                android:id="@+id/mobile_roaming"

                android:layout_width="@dimen/status_bar_mobile_signal_size"

                android:layout_height="@dimen/status_bar_mobile_signal_size"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:src="@drawable/stat_sys_roaming"

                android:contentDescription="@string/data_connection_roaming"

                android:visibility="gone" />

packages/SystemUI/res/layout/combined_qs_header.xml

+2 −1
Original line number Diff line number Diff line
@@ -126,7 +126,8 @@ 
    <com.android.systemui.battery.BatteryMeterView

        android:id="@+id/batteryRemainingIcon"

        android:layout_width="wrap_content"

        android:layout_height="0dp"

        android:layout_height="@dimen/large_screen_shade_header_min_height"

        app:layout_constraintHeight_min="@dimen/large_screen_shade_header_min_height"

        app:layout_constrainedWidth="true"

        app:textAppearance="@style/TextAppearance.QS.Status"

        app:layout_constraintStart_toEndOf="@id/statusIcons"

packages/SystemUI/res/layout/status_bar_wifi_group_inner.xml

+6 −6
Original line number Diff line number Diff line
@@ -24,11 +24,11 @@ 
        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:gravity="center_vertical"

        android:layout_marginStart="2.5sp"

        android:layout_marginStart="2.5dp"

    >

        <FrameLayout

                android:id="@+id/inout_container"

                android:layout_height="@*android:dimen/status_bar_system_icon_intrinsic_size"

                android:layout_height="17dp"

                android:layout_width="wrap_content"

                android:gravity="center_vertical" >

            <ImageView
@@ -37,14 +37,14 @@ 
                android:layout_width="wrap_content"

                android:src="@drawable/ic_activity_down"

                android:visibility="gone"

                android:paddingEnd="2sp"

                android:paddingEnd="2dp"

            />

            <ImageView

                android:id="@+id/wifi_out"

                android:layout_height="wrap_content"

                android:layout_width="wrap_content"

                android:src="@drawable/ic_activity_up"

                android:paddingEnd="2sp"

                android:paddingEnd="2dp"

                android:visibility="gone"

            />

        </FrameLayout>
@@ -62,7 +62,7 @@ 
        <View

            android:id="@+id/wifi_signal_spacer"

            android:layout_width="@dimen/status_bar_wifi_signal_spacer_width"

            android:layout_height="4sp"

            android:layout_height="4dp"

            android:visibility="gone" />



        <!-- Looks like CarStatusBar uses this... -->
@@ -75,7 +75,7 @@ 
        <View

            android:id="@+id/wifi_airplane_spacer"

            android:layout_width="@dimen/status_bar_airplane_spacer_width"

            android:layout_height="4sp"

            android:layout_height="4dp"

            android:visibility="gone"

        />

    </com.android.keyguard.AlphaOptimizedLinearLayout>

packages/SystemUI/res/values-sw720dp/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
-->

<resources>

    <!-- gap on either side of status bar notification icons -->

    <dimen name="status_bar_icon_padding">1sp</dimen>

    <dimen name="status_bar_icon_padding">1dp</dimen>



    <dimen name="controls_header_horizontal_padding">28dp</dimen>

    <dimen name="controls_content_margin_horizontal">40dp</dimen>