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

Commit 2befc231 authored by Roy Chou's avatar Roy Chou Committed by Android (Google) Code Review
Browse files

Merge changes from topic "icon_sp" into udc-qpr-dev

* changes:
  feat(non linear font scaling): scale status bar icons when font scaling changed
  chore(non linear font scaling): remove mAlwaysScaleIcon in StatusBarIconView
parents c9f03886 46c55f29
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -95,8 +95,10 @@
    <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 -->
    <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>
    <!-- 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. -->
    <dimen name="status_bar_system_icon_size">15dp</dimen>
    <!-- Intrinsic size of most system icons in status bar. This is the default value that
+1 −0
Original line number Diff line number Diff line
@@ -2298,6 +2298,7 @@

  <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_sp" />
  <java-symbol type="dimen" name="status_bar_system_icon_size" />
  <java-symbol type="dimen" name="status_bar_system_icon_intrinsic_size" />
  <java-symbol type="drawable" name="list_selector_pressed_holo_dark" />
+13 −10
Original line number Diff line number Diff line
@@ -30,12 +30,13 @@

        <FrameLayout
            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_gravity="center_vertical">
            <ImageView
                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:src="@drawable/ic_activity_down"
                android:visibility="gone"
@@ -43,7 +44,8 @@
                />
            <ImageView
                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:src="@drawable/ic_activity_up"
                android:paddingEnd="2dp"
@@ -52,11 +54,12 @@
        </FrameLayout>
        <ImageView
            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_gravity="center_vertical"
            android:paddingStart="2.5dp"
            android:paddingEnd="1dp"
            android:adjustViewBounds="true"
            android:paddingStart="2.5sp"
            android:paddingEnd="1sp"
            android:visibility="gone" />
        <Space
            android:id="@+id/mobile_roaming_space"
@@ -70,14 +73,14 @@
            android:layout_gravity="center_vertical">
            <com.android.systemui.statusbar.AnimatedImageView
                android:id="@+id/mobile_signal"
                android:layout_height="wrap_content"
                android:layout_width="wrap_content"
                android:layout_height="@dimen/status_bar_mobile_signal_size"
                android:layout_width="@dimen/status_bar_mobile_signal_size"
                systemui:hasOverlappingRendering="false"
                />
            <ImageView
                android:id="@+id/mobile_roaming"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_width="@dimen/status_bar_mobile_signal_size"
                android:layout_height="@dimen/status_bar_mobile_signal_size"
                android:layout_gravity="top|start"
                android:src="@drawable/stat_sys_roaming"
                android:contentDescription="@string/data_connection_roaming"
+2 −2
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@
         view. -->
    <Space
        android:id="@+id/icon_placeholder"
        android:layout_width="@dimen/status_bar_icon_drawing_size"
        android:layout_height="@dimen/status_bar_icon_drawing_size"
        android:layout_width="@dimen/status_bar_icon_size_sp"
        android:layout_height="@dimen/status_bar_icon_size_sp"
        android:layout_gravity="center_vertical"
    />
    <TextView
+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@

    <ImageView
        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:paddingStart="@dimen/status_bar_padding_start"
        android:paddingBottom="2dip"
Loading