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

Commit 9faee7bd authored by ryanlwlin's avatar ryanlwlin
Browse files

change icons for window magnification 

We update the icons and chane the padding of the switch.

Bug: 184081570
Test: Treehugger build pass and manually test
Change-Id: I9c059fb2706e71b9b04851929f2d15c0cf735ada
parent 8b23eff3

packages/SystemUI/res/drawable/ic_move_magnification.xml

+10 −4
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2020 The Android Open Source Project

  ~
@@ -18,7 +19,7 @@ 
    <item>

        <shape android:shape="rectangle">

            <solid

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

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

            <size

                android:height="@dimen/magnification_drag_view_size"

                android:width="@dimen/magnification_drag_view_size"/>
@@ -26,9 +27,14 @@ 
    </item>

    <item

        android:gravity="center">

        <vector android:height="28dp" android:viewportHeight="512"

            android:viewportWidth="512" android:width="28dp">

            <path android:fillColor="#FFFFFF" android:pathData="M506.528,243.712l-96.224,-80c-4.8,-4 -11.456,-4.832 -17.056,-2.208C387.616,164.16 384,169.792 384,176v48h-96v-96h48c6.208,0 11.84,-3.616 14.496,-9.248c2.624,-5.632 1.792,-12.288 -2.208,-17.056l-80,-96.224c-6.08,-7.296 -18.496,-7.296 -24.608,0l-80,96.224c-3.968,4.8 -4.832,11.456 -2.176,17.056C164.128,124.384 169.792,128 176,128h48v96h-96v-48c0,-6.208 -3.616,-11.84 -9.248,-14.496c-5.6,-2.624 -12.256,-1.792 -17.056,2.208l-96.224,80c-7.296,6.08 -7.296,18.496 0,24.608l96.224,80c4.8,3.968 11.456,4.832 17.056,2.176C124.416,347.872 128,342.208 128,336v-48h96v96h-48c-6.208,0 -11.872,3.616 -14.496,9.248c-2.656,5.632 -1.792,12.288 2.176,17.056l80,96.224c6.08,7.296 18.496,7.296 24.608,0l80,-96.224c4,-4.8 4.832,-11.456 2.208,-17.056C347.84,387.616 342.208,384 336,384h-48v-96h96v48c0,6.208 3.616,11.872 9.248,14.496c5.632,2.656 12.288,1.792 17.056,-2.176l96.224,-80C513.824,262.208 513.824,249.792 506.528,243.712z"/>

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

            android:width="24dp"

            android:height="24dp"

            android:viewportWidth="24"

            android:viewportHeight="24">

            <path

                android:pathData="M18.19,12.44l-3.24,-1.62c1.29,-1 2.12,-2.56 2.12,-4.32c0,-3.03 -2.47,-5.5 -5.5,-5.5s-5.5,2.47 -5.5,5.5c0,2.13 1.22,3.98 3,4.89v3.26c-2.11,-0.45 -2.01,-0.44 -2.26,-0.44c-0.53,0 -1.03,0.21 -1.41,0.59L4,16.22l5.09,5.09C9.52,21.75 10.12,22 10.74,22h6.3c0.98,0 1.81,-0.7 1.97,-1.67l0.8,-4.71C20.03,14.32 19.38,13.04 18.19,12.44zM17.84,15.29L17.04,20h-6.3c-0.09,0 -0.17,-0.04 -0.24,-0.1l-3.68,-3.68l4.25,0.89V6.5c0,-0.28 0.22,-0.5 0.5,-0.5c0.28,0 0.5,0.22 0.5,0.5v6h1.76l3.46,1.73C17.69,14.43 17.91,14.86 17.84,15.29zM8.07,6.5c0,-1.93 1.57,-3.5 3.5,-3.5s3.5,1.57 3.5,3.5c0,0.95 -0.38,1.81 -1,2.44V6.5c0,-1.38 -1.12,-2.5 -2.5,-2.5c-1.38,0 -2.5,1.12 -2.5,2.5v2.44C8.45,8.31 8.07,7.45 8.07,6.5z"

                android:fillColor="#FFFFFF"/>

        </vector>

    </item>

</layer-list>

packages/SystemUI/res/drawable/ic_open_in_new_fullscreen.xml

+10 −3
Original line number Diff line number Diff line
@@ -30,9 +30,16 @@ 
            android:height="24dp"

            android:viewportWidth="24"

            android:viewportHeight="24">

            <group>

                <clip-path

                    android:pathData="M0,0h24v24h-24z"/>

                <path

                android:fillColor="@android:color/white"

                android:pathData="M19,19H5V5h7V3H5c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2v-7h-2v7zM14,3v2h3.59l-9.83,9.83 1.41,1.41L19,6.41V10h2V3h-7z" />

                    android:pathData="M11,6.05V8.05H14.59L8,14.64V11.05H6V18.05H13V16.05H9.41L16,9.46V13.05H18V6.05H11Z"

                    android:fillColor="#ffffff"/>

                <path

                    android:pathData="M20,4.05V20.05H4V4.05H20ZM22,2.05H2V22.05H22V2.05Z"

                    android:fillColor="#ffffff"/>

            </group>

        </vector>

    </item>

packages/SystemUI/res/drawable/ic_open_in_new_window.xml

+13 −24
Original line number Diff line number Diff line
@@ -30,26 +30,15 @@ 
            android:height="24dp"

            android:viewportWidth="24"

            android:viewportHeight="24">



            <group

                android:translateX="1.500000"

                android:translateY="1.500000">

            <path

                    android:fillType="evenOdd"

                    android:strokeColor="#FFFFFF"

                    android:strokeWidth="2"

                    android:pathData="M 3.5 1.5 L 17.5 1.5 Q 19.5 1.5 19.5 3.5 L 19.5 17.5 Q 19.5 19.5 17.5 19.5 L 3.5 19.5 Q 1.5 19.5 1.5 17.5 L 1.5 3.5 Q 1.5 1.5 3.5 1.5 Z" />

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

                android:fillColor="#ffffff"/>

            <path

                    android:fillType="evenOdd"

                    android:strokeColor="#FFFFFF"

                    android:strokeWidth="1.5"

                    android:pathData="M 4.25 4.25 H 8.75 V 8.75 H 4.25 V 4.25 Z" />

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

                android:fillColor="#ffffff"/>

            <path

                    android:fillColor="#FFFFFF"

                    android:fillType="evenOdd"

                    android:strokeWidth="1"

                    android:pathData="M 12.5 13.92 L 15.59 17 L 17 15.59 L 13.91 12.5 L 16.5 12.5 L 16.5 10.5 L 10.5 10.5 L 10.5 16.5 L 12.5 16.5 Z" />

            </group>

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

                android:fillColor="#ffffff"/>

        </vector>

    </item>

packages/SystemUI/res/layout/window_magnifier_view.xml

+2 −0
Original line number Diff line number Diff line
@@ -77,6 +77,8 @@ 
        android:layout_height="@dimen/magnification_drag_view_size"

        android:layout_margin="@dimen/magnification_outer_border_margin"

        android:layout_gravity="right|bottom"

        android:paddingEnd="@dimen/magnifier_drag_handle_padding"

        android:paddingBottom="@dimen/magnifier_drag_handle_padding"

        android:scaleType="center"

        android:importantForAccessibility="no"

        android:src="@drawable/ic_move_magnification"/>

packages/SystemUI/res/values/dimens.xml

+3 −1
Original line number Diff line number Diff line
@@ -1243,11 +1243,13 @@ 
    <dimen name="magnification_drag_view_size">38dp</dimen>

    <dimen name="magnification_controls_size">90dp</dimen>

    <dimen name="magnification_switch_button_size">60dp</dimen>

    <dimen name="magnification_switch_button_padding">12dp</dimen>

    <dimen name="magnification_switch_button_padding">6dp</dimen>

    <dimen name="magnifier_left_right_controls_width">35dp</dimen>

    <dimen name="magnifier_left_right_controls_height">45dp</dimen>

    <dimen name="magnifier_up_down_controls_width">45dp</dimen>

    <dimen name="magnifier_up_down_controls_height">40dp</dimen>

    <!-- The extra padding to show the whole outer border -->

    <dimen name="magnifier_drag_handle_padding">3dp</dimen>



    <!-- Home Controls -->

    <dimen name="controls_header_side_margin">4dp</dimen>