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

Commit 97db80ac authored by Minche Li's avatar Minche Li Committed by Automerger Merge Worker
Browse files

Merge "Adjusts measurement for magnification switch and drag handle" into sc-dev am: cf758119 

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

Change-Id: If310da9ee28c30727872244d4b9051246b9dc671
parents 07d8a8dc cf758119

packages/SystemUI/res/drawable/ic_move_magnification.xml

+3 −3
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
    <item>

        <shape android:shape="rectangle">

            <solid

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

                android:color="@color/magnification_drag_handle_color" />

            <size

                android:height="@dimen/magnification_drag_view_size"

                android:width="@dimen/magnification_drag_view_size"/>
@@ -28,8 +28,8 @@ 
    <item

        android:gravity="center">

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

            android:width="24dp"

            android:height="24dp"

            android:width="30dp"

            android:height="30dp"

            android:viewportWidth="24"

            android:viewportHeight="24">

            <path

packages/SystemUI/res/drawable/ic_open_in_new_fullscreen.xml

+4 −3
Original line number Diff line number Diff line
@@ -24,10 +24,11 @@ 
        </shape>

    </item>



    <item>

    <item

        android:gravity="center">

        <vector

            android:width="24dp"

            android:height="24dp"

            android:width="36dp"

            android:height="36dp"

            android:viewportWidth="24"

            android:viewportHeight="24">

            <group>

packages/SystemUI/res/drawable/ic_open_in_new_window.xml

+4 −3
Original line number Diff line number Diff line
@@ -24,10 +24,11 @@ 
        </shape>

    </item>



    <item>

    <item

        android:gravity="center">

        <vector

            android:width="24dp"

            android:height="24dp"

            android:width="36dp"

            android:height="36dp"

            android:viewportWidth="24"

            android:viewportHeight="24">

            <path

packages/SystemUI/res/layout/window_magnifier_view.xml

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ 
        android:id="@+id/drag_handle"

        android:layout_width="@dimen/magnification_drag_view_size"

        android:layout_height="@dimen/magnification_drag_view_size"

        android:layout_margin="@dimen/magnification_outer_border_margin"

        android:layout_margin="@dimen/magnification_inner_border_margin"

        android:layout_gravity="right|bottom"

        android:paddingEnd="@dimen/magnifier_drag_handle_padding"

        android:paddingBottom="@dimen/magnifier_drag_handle_padding"

packages/SystemUI/res/values/colors.xml

+1 −0
Original line number Diff line number Diff line
@@ -247,6 +247,7 @@ 
    <!-- Window magnification colors -->

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

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

    <color name="magnification_drag_handle_color">#B3000000</color>



    <!-- Volume dialog colors -->

    <color name="volume_dialog_background_color">@android:color/transparent</color>