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

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

Merge changes from topic "magnification_settings" into udc-dev 

* changes:
  fix(#MagSettingsPanel): modify content desription for buttons
  chore(#MagSettingsPanel): adjust magnification settings panel ui when showing for fullscreen magnifier
  chore(#MagSettingsPanel): modify MagnificationModeSwitch icon
  feat(#MagSettingsPanel)!: support WindowMagnificationSettings for fullscreen magnifier
  feat(#MagSettingsPanel): add removeMagnificationSettingsPanel method in WindowMagnificationConnection
  feat(#MagSettingsPanel): add MagnificationSettingsController to interact with WindowMagnificationSetting
parents 19c0b7ee 65dbc739

core/java/android/view/accessibility/IWindowMagnificationConnection.aidl

+7 −0
Original line number Diff line number Diff line
@@ -102,6 +102,13 @@ oneway interface IWindowMagnificationConnection { 
     */

    void removeMagnificationButton(int displayId);



    /**

     * Requests System UI remove magnification settings panel on the specified display.

     *

     * @param displayId the logical display id.

     */

    void removeMagnificationSettingsPanel(int displayId);



    /**

     * Sets {@link IWindowMagnificationConnectionCallback} to receive the request or the callback.

     *

packages/SystemUI/res/drawable/ic_open_in_new_window.xml

+15 −18
Original line number Diff line number Diff line
@@ -17,29 +17,26 @@ 


    <item>

        <shape android:shape="rectangle">

            <solid android:color="@color/magnification_switch_button_color" />

            <stroke

                android:color="@android:color/black"

                android:width="@dimen/magnifier_stroke_width"/>

            <corners android:radius="@dimen/magnification_setting_drag_corner_radius" />

            <solid android:color="@color/magnification_border_color" />

            <size

                android:width="48dp"

                android:height="48dp" />

                android:width="@dimen/magnification_setting_drag_size"

                android:height="@dimen/magnification_setting_drag_size" />

        </shape>

    </item>



    <item

        android:gravity="center">

        <vector

    <item android:gravity="center">

        <vector android:autoMirrored="true"

                android:width="36dp"

                android:height="36dp"

            android:viewportWidth="24"

            android:viewportHeight="24">

                android:viewportWidth="48"

                android:viewportHeight="48">

            <path

                android:pathData="M2,12.05V22.05H22V2.05H12V4.05H20V20.05H4V12.05H2Z"

                android:fillColor="#ffffff"/>

            <path

                android:pathData="M10,2.05H2V10.05H10V2.05Z"

                android:fillColor="#ffffff"/>

            <path

                android:pathData="M18,11.05V13.05H14.41L18.95,17.59L17.54,19L13,14.46V18.05H11V11.05H18Z"

                android:fillColor="#ffffff"/>

                android:pathData="m19.4,44 l-1,-6.3q-0.95,-0.35 -2,-0.95t-1.85,-1.25l-5.9,2.7L4,30l5.4,-3.95q-0.1,-0.45 -0.125,-1.025Q9.25,24.45 9.25,24q0,-0.45 0.025,-1.025T9.4,21.95L4,18l4.65,-8.2 5.9,2.7q0.8,-0.65 1.85,-1.25t2,-0.9l1,-6.35h9.2l1,6.3q0.95,0.35 2.025,0.925Q32.7,11.8 33.45,12.5l5.9,-2.7L44,18l-5.4,3.85q0.1,0.5 0.125,1.075 0.025,0.575 0.025,1.075t-0.025,1.05q-0.025,0.55 -0.125,1.05L44,30l-4.65,8.2 -5.9,-2.7q-0.8,0.65 -1.825,1.275 -1.025,0.625 -2.025,0.925l-1,6.3ZM21.8,41h4.4l0.7,-5.6q1.65,-0.4 3.125,-1.25T32.7,32.1l5.3,2.3 2,-3.6 -4.7,-3.45q0.2,-0.85 0.325,-1.675 0.125,-0.825 0.125,-1.675 0,-0.85 -0.1,-1.675 -0.1,-0.825 -0.35,-1.675L40,17.2l-2,-3.6 -5.3,2.3q-1.15,-1.3 -2.6,-2.175 -1.45,-0.875 -3.2,-1.125L26.2,7h-4.4l-0.7,5.6q-1.7,0.35 -3.175,1.2 -1.475,0.85 -2.625,2.1L10,13.6l-2,3.6 4.7,3.45q-0.2,0.85 -0.325,1.675 -0.125,0.825 -0.125,1.675 0,0.85 0.125,1.675 0.125,0.825 0.325,1.675L8,30.8l2,3.6 5.3,-2.3q1.2,1.2 2.675,2.05Q19.45,35 21.1,35.4ZM24,30.5q2.7,0 4.6,-1.9 1.9,-1.9 1.9,-4.6 0,-2.7 -1.9,-4.6 -1.9,-1.9 -4.6,-1.9 -2.7,0 -4.6,1.9 -1.9,1.9 -1.9,4.6 0,2.7 1.9,4.6 1.9,1.9 4.6,1.9ZM24,24Z"

                android:fillColor="#000000"/>

        </vector>

    </item>

packages/SystemUI/res/layout/window_magnification_settings_view.xml

+10 −5
Original line number Diff line number Diff line
@@ -63,7 +63,8 @@ 
            android:background="@drawable/accessibility_magnification_setting_view_image_btn_bg"

            android:src="@drawable/ic_magnification_menu_small"

            android:tint="@color/accessibility_magnification_image_button_tint"

            android:tintMode="src_atop" />

            android:tintMode="src_atop"

            android:contentDescription="@string/accessibility_magnification_small" />



        <ImageButton

            android:id="@+id/magnifier_medium_button"
@@ -74,7 +75,8 @@ 
            android:background="@drawable/accessibility_magnification_setting_view_image_btn_bg"

            android:src="@drawable/ic_magnification_menu_medium"

            android:tint="@color/accessibility_magnification_image_button_tint"

            android:tintMode="src_atop" />

            android:tintMode="src_atop"

            android:contentDescription="@string/accessibility_magnification_medium" />



        <ImageButton

            android:id="@+id/magnifier_large_button"
@@ -85,7 +87,8 @@ 
            android:background="@drawable/accessibility_magnification_setting_view_image_btn_bg"

            android:src="@drawable/ic_magnification_menu_large"

            android:tint="@color/accessibility_magnification_image_button_tint"

            android:tintMode="src_atop" />

            android:tintMode="src_atop"

            android:contentDescription="@string/accessibility_magnification_large" />



        <ImageButton

            android:id="@+id/magnifier_full_button"
@@ -96,15 +99,16 @@ 
            android:background="@drawable/accessibility_magnification_setting_view_image_btn_bg"

            android:src="@drawable/ic_open_in_full"

            android:tint="@color/accessibility_magnification_image_button_tint"

            android:tintMode="src_atop" />

            android:tintMode="src_atop"

            android:contentDescription="@string/accessibility_magnification_fullscreen" />

    </LinearLayout>



    <LinearLayout

        android:id="@+id/magnifier_horizontal_lock_view"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="horizontal"

        android:layout_marginTop="@dimen/magnification_setting_view_margin"

        android:layout_marginBottom="@dimen/magnification_setting_view_margin"

        android:focusable="true">



        <TextView
@@ -132,6 +136,7 @@ 
        android:layout_height="wrap_content"

        android:text="@string/accessibility_magnification_zoom"

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

        android:layout_marginTop="@dimen/magnification_setting_view_margin"

        android:focusable="true" />



    <com.android.systemui.common.ui.view.SeekBarWithIconButtonsView

packages/SystemUI/res/values/colors.xml

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


    <!-- Window magnification colors -->

    <color name="magnification_border_color">#F29900</color>

    <color name="magnification_switch_button_color">#7F000000</color>

    <color name="magnification_drag_corner_background">#E5FFFFFF</color>

    <color name="magnification_drag_handle_stroke">#000000</color>

    <color name="magnification_drag_handle_background_change">#111111</color>

packages/SystemUI/res/values/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -1175,6 +1175,8 @@ 
    <dimen name="magnification_setting_image_button_padding_horizontal">24dp</dimen>

    <dimen name="magnification_setting_image_button_open_in_full_padding_vertical">16dp</dimen>

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

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

    <dimen name="magnification_setting_drag_size">56dp</dimen>



    <!-- Seekbar with icon buttons -->

    <dimen name="seekbar_icon_size">24dp</dimen>