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

Commit eb27682a authored by Antony Sargent's avatar Antony Sargent Committed by android-build-merger
Browse files

Merge "Update auto-rotate and print icons" into pi-dev am: bca78e76 

am: 6d3558be

Change-Id: Ia33931707741a9569ea1cefe0421db882c8173df
parents 82e99c78 6d3558be

packages/SettingsLib/res/drawable/ic_landscape_from_auto_rotate.xml

+7 −45
Original line number Diff line number Diff line
@@ -17,50 +17,12 @@ 
<vector

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

    android:name="ic_rotate_to_landscape"

    android:height="48dp"

    android:width="48dp"

    android:viewportHeight="48"

    android:viewportWidth="48"

    android:width="24dp"

    android:height="24dp"

    android:viewportHeight="24.0"

    android:viewportWidth="24.0"

    android:tint="?android:attr/colorControlNormal" >

    <group

        android:name="device"

        android:translateX="24"

        android:translateY="24" >

        <group

            android:name="device_pivot"

            android:translateX="-24.15"

            android:translateY="-24.25" >

            <group

                android:name="landscape"

                android:translateX="24"

                android:translateY="24"

                android:scaleX="0.909"

                android:scaleY="0.909"

                android:rotation="45" >

    <path

                    android:name="device_merged"

                    android:pathData="M -21.9799957275,-10.0 c 0.0,0.0 -0.0200042724609,20.0 -0.0200042724609,20.0 c 0.0,2.19999694824 1.80000305176,4.0 4.0,4.0 c 0.0,0.0 36.0,0.0 36.0,0.0 c 2.19999694824,0.0 4.0,-1.80000305176 4.0,-4.0 c 0.0,0.0 0.0,-20.0 0.0,-20.0 c 0.0,-2.19999694824 -1.80000305176,-4.0 -4.0,-4.0 c 0.0,0.0 -36.0,0.0 -36.0,0.0 c -2.19999694824,0.0 -3.97999572754,1.80000305176 -3.97999572754,4.0 Z M 14.0,10.0 c 0.0,0.0 -28.0,0.0 -28.0,0.0 c 0.0,0.0 0.0,-20.0 0.0,-20.0 c 0.0,0.0 28.0,0.0 28.0,0.0 c 0.0,0.0 0.0,20.0 0.0,20.0 Z"

                    android:fillColor="#FFFFFFFF" />

            </group>

        </group>

    </group>

    <group

        android:name="arrows"

        android:translateX="24"

        android:translateY="24" >

        <group

            android:name="arrows_pivot"

            android:translateX="-24.0798"

            android:translateY="-24.23" >

            <group

                android:name="arrows_0"

                android:translateX="12.2505"

                android:translateY="37.2145" >

                <path

                    android:name="bottom_merged"

                    android:pathData="M 20.7395019531,-31.9844970703 c 6.23999023438,2.83999633789 10.6999969482,8.7200012207 11.8399963379,15.7799987793 c 0.119995117188,0.699996948242 0.740005493164,1.2200012207 1.46099853516,1.2200012207 c 0.919998168945,0.0 1.6190032959,-0.84001159668 1.47900390625,-1.74000549316 c -1.75900268555,-10.3800048828 -9.75900268555,-19.1199951172 -22.5800018311,-20.1600036621 c -0.919998168945,-0.0800018310547 -1.43899536133,1.04000854492 -0.800003051758,1.70001220703 c 0.0,0.0 5.12100219727,5.11999511719 5.12100219727,5.11999511719 c 0.378997802734,0.380004882812 0.97900390625,0.380004882812 1.37899780273,0.020004272461 c 0.0,0.0 2.10000610352,-1.94000244141 2.10000610352,-1.94000244141 Z M 2.73950195312,6.01550292969 c -6.26000976562,-2.83999633789 -10.7200012207,-8.76000976562 -11.8399963379,-15.8600006104 c -0.118011474609,-0.667007446289 -0.702011108398,-1.15100097656 -1.38000488281,-1.13999938965 c -0.860000610352,0.0 -1.52000427246,0.759994506836 -1.38000488281,1.61999511719 c 1.54000854492,10.4000091553 9.5,19.2200012207 22.4199981689,20.2799987793 c 0.920013427734,0.0800018310547 1.44100952148,-1.03999328613 0.800003051758,-1.69999694824 c 0.0,0.0 -5.11999511719,-5.11999511719 -5.11999511719,-5.11999511719 c -0.380004882812,-0.376007080078 -0.988998413086,-0.385009765625 -1.38000488281,-0.0200042724609 c 0.0,0.0 -2.11999511719,1.94000244141 -2.11999511719,1.94000244141 Z"

                    android:fillColor="#FFFFFFFF" />

            </group>

        </group>

    </group>

        android:fillColor="#FF000000"

        android:pathData="M12.72,23H11C5.49,23 1,18.51 1,13h2c0,3.78 2.63,6.95 6.15,7.79L8.13,19L9.87,18L12.72,23zM13,1h-1.72l2.85,5L15.87,5l-1.02,-1.79C18.37,4.05 21,7.22 21,11h2C23,5.49 18.51,1 13,1zM10.23,6L18,13.76L13.77,18L6,10.24L10.23,6C10.23,6 10.23,6 10.23,6M10.23,4C9.72,4 9.21,4.2 8.82,4.59L4.59,8.82c-0.78,0.78 -0.78,2.04 0,2.82l7.77,7.77c0.39,0.39 0.9,0.59 1.41,0.59c0.51,0 1.02,-0.2 1.41,-0.59l4.24,-4.24c0.78,-0.78 0.78,-2.04 0,-2.82l-7.77,-7.77C11.26,4.2 10.75,4 10.23,4L10.23,4z"/>

</vector>

packages/SettingsLib/res/drawable/ic_settings_print.xml

+4 −7
Original line number Diff line number Diff line
@@ -14,15 +14,12 @@ 
    limitations under the License.

-->

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

        android:width="24.0dp"

        android:height="24.0dp"

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0"

        android:tint="?android:attr/colorControlNormal">

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M19,8H5c-1.66,0-3,1.34-3,3v5c0,0.55,0.45,1,1,1h3v3c0,0.55,0.45,1,1,1h10c0.55,0,1-0.45,1-1v-3h3c0.55,0,1-0.45,1-1v-5

C22,9.34,20.66,8,19,8z M16,19H8v-5h8V19z

M19,12c-0.55,0-1-0.45-1-1s0.45-1,1-1s1,0.45,1,1S19.55,12,19,12z M17,3H7

C6.45,3,6,3.45,6,4v3h12V4C18,3.45,17.55,3,17,3z"/>

        android:fillColor="#FF000000"

        android:pathData="M19,8h-1V3H6v5H5c-1.66,0 -3,1.34 -3,3v6h4v4h12v-4h4v-6C22,9.34 20.66,8 19,8zM16,19H8v-4h8V19zM16,8H8V5h8V8zM18,12.5c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1s1,0.45 1,1S18.55,12.5 18,12.5z"/>

</vector>