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

Commit 47bff7ea authored by Candice Lo's avatar Candice Lo Committed by Automerger Merge Worker
Browse files

Merge "Trigger re-inflation when configuration changed" into udc-dev am: 07937a00 

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



Change-Id: I00fe6cf3580ba2129ccd4f65e52400059ea2287a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 17f5ee00 07937a00

packages/SystemUI/res/drawable/ic_magnification_menu_large.xml

+2 −2
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 
    limitations under the License.

-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="48dp"

    android:height="48dp"

    android:width="32dp"

    android:height="32dp"

    android:viewportWidth="48"

    android:viewportHeight="48"

    android:tint="?attr/colorControlNormal">

packages/SystemUI/res/drawable/ic_magnification_menu_medium.xml

+2 −2
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 
    limitations under the License.

-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="48dp"

    android:height="48dp"

    android:width="32dp"

    android:height="32dp"

    android:viewportWidth="48"

    android:viewportHeight="48"

    android:tint="?attr/colorControlNormal">

packages/SystemUI/res/drawable/ic_magnification_menu_small.xml

+2 −2
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 
    limitations under the License.

-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="48dp"

    android:height="48dp"

    android:width="32dp"

    android:height="32dp"

    android:viewportWidth="48"

    android:viewportHeight="48"

    android:tint="?attr/colorControlNormal">

packages/SystemUI/res/drawable/ic_open_in_full.xml

+2 −2
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 
  ~ limitations under the License.

  -->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="48dp"

    android:height="48dp"

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="48"

    android:viewportHeight="48"

    android:tint="?attr/colorControlNormal">

packages/SystemUI/res/layout/window_magnification_settings_view.xml

+10 −35
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
            android:text="@string/accessibility_magnifier_size"

            android:textAppearance="@style/TextAppearance.MagnificationSetting.Title"

            android:focusable="true"

            android:layout_gravity="center_vertical|left" />

            android:layout_gravity="center_vertical" />



        <Button

            android:id="@+id/magnifier_edit_button"
@@ -45,25 +45,22 @@ 
            android:text="@string/accessibility_magnifier_edit"

            android:textAppearance="@style/TextAppearance.MagnificationSetting.EditButton"

            android:focusable="true"

            android:layout_gravity="right" />

            android:layout_gravity="center_vertical" />

    </LinearLayout>



    <LinearLayout

        android:background="@drawable/accessibility_magnification_setting_view_image_btn_layout_bg"

        android:layout_width="@dimen/magnification_setting_image_button_background_width"

        android:layout_width="match_parent"

        android:layout_height="@dimen/magnification_setting_image_button_height"

        android:minWidth="@dimen/magnification_setting_image_button_background_width"

        android:orientation="horizontal">

        <ImageButton

            android:id="@+id/magnifier_small_button"

            android:layout_width="0dp"

            android:layout_height="@dimen/magnification_setting_image_button_height"

            android:layout_weight="1"

            android:scaleType="fitCenter"

            android:scaleType="center"

            android:background="@drawable/accessibility_magnification_setting_view_image_btn_bg"

            android:paddingLeft="@dimen/magnification_setting_image_button_padding_horizontal"

            android:paddingRight="@dimen/magnification_setting_image_button_padding_horizontal"

            android:paddingTop="@dimen/magnification_setting_image_button_padding_vertical"

            android:paddingBottom="@dimen/magnification_setting_image_button_padding_vertical"

            android:src="@drawable/ic_magnification_menu_small"

            android:tint="@color/accessibility_magnification_image_button_tint"

            android:tintMode="src_atop" />
@@ -73,12 +70,8 @@ 
            android:layout_width="0dp"

            android:layout_height="@dimen/magnification_setting_image_button_height"

            android:layout_weight="1"

            android:scaleType="fitCenter"

            android:scaleType="center"

            android:background="@drawable/accessibility_magnification_setting_view_image_btn_bg"

            android:paddingLeft="@dimen/magnification_setting_image_button_padding_horizontal"

            android:paddingRight="@dimen/magnification_setting_image_button_padding_horizontal"

            android:paddingTop="@dimen/magnification_setting_image_button_padding_vertical"

            android:paddingBottom="@dimen/magnification_setting_image_button_padding_vertical"

            android:src="@drawable/ic_magnification_menu_medium"

            android:tint="@color/accessibility_magnification_image_button_tint"

            android:tintMode="src_atop" />
@@ -88,12 +81,8 @@ 
            android:layout_width="0dp"

            android:layout_height="@dimen/magnification_setting_image_button_height"

            android:layout_weight="1"

            android:scaleType="fitCenter"

            android:scaleType="center"

            android:background="@drawable/accessibility_magnification_setting_view_image_btn_bg"

            android:paddingLeft="@dimen/magnification_setting_image_button_padding_horizontal"

            android:paddingRight="@dimen/magnification_setting_image_button_padding_horizontal"

            android:paddingTop="@dimen/magnification_setting_image_button_padding_vertical"

            android:paddingBottom="@dimen/magnification_setting_image_button_padding_vertical"

            android:src="@drawable/ic_magnification_menu_large"

            android:tint="@color/accessibility_magnification_image_button_tint"

            android:tintMode="src_atop" />
@@ -103,16 +92,8 @@ 
            android:layout_width="0dp"

            android:layout_height="@dimen/magnification_setting_image_button_height"

            android:layout_weight="1"

            android:scaleType="fitCenter"

            android:scaleType="center"

            android:background="@drawable/accessibility_magnification_setting_view_image_btn_bg"

            android:paddingLeft

                ="@dimen/magnification_setting_image_button_open_in_full_padding_horizontal"

            android:paddingRight

                ="@dimen/magnification_setting_image_button_open_in_full_padding_horizontal"

            android:paddingTop

                ="@dimen/magnification_setting_image_button_open_in_full_padding_vertical"

            android:paddingBottom

                ="@dimen/magnification_setting_image_button_open_in_full_padding_vertical"

            android:src="@drawable/ic_open_in_full"

            android:tint="@color/accessibility_magnification_image_button_tint"

            android:tintMode="src_atop" />
@@ -130,7 +111,6 @@ 
            android:layout_width="0dp"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:singleLine="true"

            android:text="@string/accessibility_allow_diagonal_scrolling"

            android:textAppearance="@style/TextAppearance.MagnificationSetting.Title"

            android:layout_gravity="center_vertical" />
@@ -166,16 +146,11 @@ 
    <Button

        android:id="@+id/magnifier_done_button"

        android:background="@drawable/accessibility_window_magnification_button_done_bg"

        android:minHeight="@dimen/magnification_setting_button_done_height"

        android:layout_width="@dimen/magnification_setting_button_done_width"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:text="@string/accessibility_magnification_done"

        android:textAppearance="@style/TextAppearance.MagnificationSetting.DoneButton"

        android:focusable="true"

        android:layout_gravity="center_horizontal"

        android:layout_marginTop="@dimen/magnification_setting_view_margin"

        android:paddingLeft="@dimen/magnification_setting_button_done_padding_horizontal"

        android:paddingRight="@dimen/magnification_setting_button_done_padding_horizontal"

        android:paddingTop="@dimen/magnification_setting_button_done_padding_vertical"

        android:paddingBottom="@dimen/magnification_setting_button_done_padding_vertical" />

        android:layout_marginTop="@dimen/magnification_setting_view_margin"/>

</LinearLayout>