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

Commit 17d1674a authored by Daniel Norman's avatar Daniel Norman Committed by Android (Google) Code Review
Browse files

Merge "feat(magnify_ime): Update strings & order for magnification toggles" into main

parents 429bd452 eda50e80

packages/SystemUI/res/layout/window_magnification_settings_view.xml

+8 −8
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ 
    </LinearLayout>



    <LinearLayout

        android:id="@+id/magnifier_typing_view"

        android:id="@+id/magnifier_keyboard_view"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="horizontal"
@@ -147,18 +147,18 @@ 
        android:visibility="gone">



        <TextView

            android:id="@+id/magnifier_typing_title"

            android:id="@+id/magnifier_keyboard_title"

            android:layout_width="0dp"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:layout_marginEnd="@dimen/magnification_setting_view_item_horizontal_spacing"

            android:text="@string/accessibility_magnify_typing"

            android:text="@string/accessibility_magnify_keyboard"

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

            android:labelFor="@id/magnifier_horizontal_lock_switch"

            android:layout_gravity="center_vertical" />



        <com.google.android.material.materialswitch.MaterialSwitch

            android:id="@+id/magnifier_typing_switch"

            android:id="@+id/magnifier_keyboard_switch"

            android:layout_gravity="right|center_vertical"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"
@@ -170,7 +170,7 @@ 
    </LinearLayout>



    <LinearLayout

        android:id="@+id/magnifier_keyboard_view"

        android:id="@+id/magnifier_typing_view"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="horizontal"
@@ -179,18 +179,18 @@ 
        android:visibility="gone">



        <TextView

            android:id="@+id/magnifier_keyboard_title"

            android:id="@+id/magnifier_typing_title"

            android:layout_width="0dp"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:layout_marginEnd="@dimen/magnification_setting_view_item_horizontal_spacing"

            android:text="@string/accessibility_magnify_keyboard"

            android:text="@string/accessibility_magnify_typing"

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

            android:labelFor="@id/magnifier_horizontal_lock_switch"

            android:layout_gravity="center_vertical" />



        <com.google.android.material.materialswitch.MaterialSwitch

            android:id="@+id/magnifier_keyboard_switch"

            android:id="@+id/magnifier_typing_switch"

            android:layout_gravity="right|center_vertical"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

packages/SystemUI/res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -3063,7 +3063,7 @@ 
    <!-- Title of the magnification option button allow diagonal scrolling [CHAR LIMIT=NONE]-->

    <string name="accessibility_allow_diagonal_scrolling">Allow diagonal scrolling</string>

    <!-- Title of the magnification option button allow magnify typing [CHAR LIMIT=NONE]-->

    <string name="accessibility_magnify_typing">Magnify typing</string>

    <string name="accessibility_magnify_typing">Follow typing</string>

    <!-- Title of the magnification option button allow magnify keyboard [CHAR LIMIT=NONE]-->

    <string name="accessibility_magnify_keyboard">Magnify keyboard</string>

    <!-- Title of the magnification option button Resize [CHAR LIMIT=NONE]-->