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

Commit 46c55f29 authored by Roy Chou's avatar Roy Chou
Browse files

feat(non linear font scaling): scale status bar icons when font scaling changed 

When font scaling changed to larger, such as 200%, the status bar notification/system icons would be too smaller, compared with clock/battery text size. Therefore, we also scale the status bar icons when font scaling changed.

Besides, we adjust OngoingPrivacyChip to ensure the image in chip also scaled with font scaling.

Bug: 282111042
Test: manually - video attached in bug
      atest frameworks/base/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/
      atest StatusBarIconViewTest
Change-Id: I9b876ec9703a3d7310c434b1c025c297e8d5a39d
parent c7f002fd

core/res/res/values/dimens.xml

+3 −1
Original line number Original line Diff line number Diff line
@@ -95,8 +95,10 @@ 
    <dimen name="navigation_bar_height_landscape_car_mode">96dp</dimen>

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

    <!-- Width of the navigation bar when it is placed vertically on the screen in car mode -->

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

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

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

    <!-- Original dp height of notification icons in the status bar  -->

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

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

    <!-- New sp height of notification icons in the status bar  -->

    <dimen name="status_bar_icon_size_sp">22sp</dimen>

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

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

    <dimen name="status_bar_system_icon_size">15dp</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

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

core/res/res/values/symbols.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -2298,6 +2298,7 @@ 




  <java-symbol type="bool" name="config_alwaysUseCdmaRssi" />

  <java-symbol type="bool" name="config_alwaysUseCdmaRssi" />

  <java-symbol type="dimen" name="status_bar_icon_size" />

  <java-symbol type="dimen" name="status_bar_icon_size" />

  <java-symbol type="dimen" name="status_bar_icon_size_sp" />

  <java-symbol type="dimen" name="status_bar_system_icon_size" />

  <java-symbol type="dimen" name="status_bar_system_icon_size" />

  <java-symbol type="dimen" name="status_bar_system_icon_intrinsic_size" />

  <java-symbol type="dimen" name="status_bar_system_icon_intrinsic_size" />

  <java-symbol type="drawable" name="list_selector_pressed_holo_dark" />

  <java-symbol type="drawable" name="list_selector_pressed_holo_dark" />

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

+13 −10
Original line number Original line Diff line number Diff line
@@ -30,12 +30,13 @@ 




        <FrameLayout

        <FrameLayout

            android:id="@+id/inout_container"

            android:id="@+id/inout_container"

            android:layout_height="17dp"

            android:layout_height="@dimen/status_bar_mobile_inout_container_size"

            android:layout_width="wrap_content"

            android:layout_width="wrap_content"

            android:layout_gravity="center_vertical">

            android:layout_gravity="center_vertical">

            <ImageView

            <ImageView

                android:id="@+id/mobile_in"

                android:id="@+id/mobile_in"

                android:layout_height="wrap_content"

                android:layout_height="@dimen/status_bar_mobile_signal_size"

                android:adjustViewBounds="true"

                android:layout_width="wrap_content"

                android:layout_width="wrap_content"

                android:src="@drawable/ic_activity_down"

                android:src="@drawable/ic_activity_down"

                android:visibility="gone"

                android:visibility="gone"
@@ -43,7 +44,8 @@ 
                />

                />

            <ImageView

            <ImageView

                android:id="@+id/mobile_out"

                android:id="@+id/mobile_out"

                android:layout_height="wrap_content"

                android:layout_height="@dimen/status_bar_mobile_signal_size"

                android:adjustViewBounds="true"

                android:layout_width="wrap_content"

                android:layout_width="wrap_content"

                android:src="@drawable/ic_activity_up"

                android:src="@drawable/ic_activity_up"

                android:paddingEnd="2dp"

                android:paddingEnd="2dp"
@@ -52,11 +54,12 @@ 
        </FrameLayout>

        </FrameLayout>

        <ImageView

        <ImageView

            android:id="@+id/mobile_type"

            android:id="@+id/mobile_type"

            android:layout_height="wrap_content"

            android:layout_height="@dimen/status_bar_mobile_signal_size"

            android:layout_width="wrap_content"

            android:layout_width="wrap_content"

            android:layout_gravity="center_vertical"

            android:layout_gravity="center_vertical"

            android:paddingStart="2.5dp"

            android:adjustViewBounds="true"

            android:paddingEnd="1dp"

            android:paddingStart="2.5sp"

            android:paddingEnd="1sp"

            android:visibility="gone" />

            android:visibility="gone" />

        <Space

        <Space

            android:id="@+id/mobile_roaming_space"

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

            android:layout_gravity="center_vertical">

            <com.android.systemui.statusbar.AnimatedImageView

            <com.android.systemui.statusbar.AnimatedImageView

                android:id="@+id/mobile_signal"

                android:id="@+id/mobile_signal"

                android:layout_height="wrap_content"

                android:layout_height="@dimen/status_bar_mobile_signal_size"

                android:layout_width="wrap_content"

                android:layout_width="@dimen/status_bar_mobile_signal_size"

                systemui:hasOverlappingRendering="false"

                systemui:hasOverlappingRendering="false"

                />

                />

            <ImageView

            <ImageView

                android:id="@+id/mobile_roaming"

                android:id="@+id/mobile_roaming"

                android:layout_width="wrap_content"

                android:layout_width="@dimen/status_bar_mobile_signal_size"

                android:layout_height="wrap_content"

                android:layout_height="@dimen/status_bar_mobile_signal_size"

                android:layout_gravity="top|start"

                android:layout_gravity="top|start"

                android:src="@drawable/stat_sys_roaming"

                android:src="@drawable/stat_sys_roaming"

                android:contentDescription="@string/data_connection_roaming"

                android:contentDescription="@string/data_connection_roaming"

packages/SystemUI/res/layout/heads_up_status_bar_layout.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -27,8 +27,8 @@ 
         view. -->

         view. -->

    <Space

    <Space

        android:id="@+id/icon_placeholder"

        android:id="@+id/icon_placeholder"

        android:layout_width="@dimen/status_bar_icon_drawing_size"

        android:layout_width="@dimen/status_bar_icon_size_sp"

        android:layout_height="@dimen/status_bar_icon_drawing_size"

        android:layout_height="@dimen/status_bar_icon_size_sp"

        android:layout_gravity="center_vertical"

        android:layout_gravity="center_vertical"

    />

    />

    <TextView

    <TextView

packages/SystemUI/res/layout/status_bar.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -32,7 +32,7 @@ 




    <ImageView

    <ImageView

        android:id="@+id/notification_lights_out"

        android:id="@+id/notification_lights_out"

        android:layout_width="@dimen/status_bar_icon_size"

        android:layout_width="@dimen/status_bar_icon_size_sp"

        android:layout_height="match_parent"

        android:layout_height="match_parent"

        android:paddingStart="@dimen/status_bar_padding_start"

        android:paddingStart="@dimen/status_bar_padding_start"

        android:paddingBottom="2dip"

        android:paddingBottom="2dip"