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

Commit 09ba6909 authored by Evan Laird's avatar Evan Laird Committed by android-build-merger
Browse files

Merge "Update X, -, + icons in dnd panel" into oc-dr1-dev 

am: 6b0c1604

Change-Id: I400f6c493469bc775bce9ef903fd496a33524a74
parents 4160fb3e 6b0c1604

packages/SystemUI/res/drawable/ic_close_white_rounded.xml

0 → 100644
+26 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

    Copyright (C) 2017 The Android Open Source Project



    Licensed under the Apache License, Version 2.0 (the "License");

    you may not use this file except in compliance with the License.

    You may obtain a copy of the License at



         http://www.apache.org/licenses/LICENSE-2.0



    Unless required by applicable law or agreed to in writing, software

    distributed under the License is distributed on an "AS IS" BASIS,

    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

    See the License for the specific language governing permissions and

    limitations under the License.

-->



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

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24.0"

    android:viewportHeight="24.0">

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M18.3,5.71a0.996,0.996 0,0 0,-1.41 0L12,10.59 7.11,5.7A0.996,0.996 0,1 0,5.7 7.11L10.59,12 5.7,16.89a0.996,0.996 0,1 0,1.41 1.41L12,13.41l4.89,4.89a0.996,0.996 0,1 0,1.41 -1.41L13.41,12l4.89,-4.89c0.38,-0.38 0.38,-1.02 0,-1.4z"/>

</vector>

packages/SystemUI/res/drawable/ic_qs_minus.xml

+5 −7
Original line number Diff line number Diff line 
<!--

     Copyright (C) 2015 The Android Open Source Project

     Copyright (C) 2017 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.
@@ -15,12 +15,10 @@ 
-->

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

    android:height="24.0dp"

    android:viewportHeight="48.0"

    android:viewportWidth="48.0"

    android:viewportHeight="24.0"

    android:viewportWidth="24.0"

    android:width="24.0dp" >



    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M38.0,26.0L10.0,26.0l0.0,-4.0l28.0,0.0l0.0,4.0z" />



        android:pathData="M18,13H6c-0.55,0 -1,-0.45 -1,-1v0c0,-0.55 0.45,-1 1,-1h12c0.55,0 1,0.45 1,1v0C19,12.55 18.55,13 18,13z"/>

</vector>

packages/SystemUI/res/drawable/ic_qs_plus.xml

+5 −7
Original line number Diff line number Diff line 
<!--

     Copyright (C) 2015 The Android Open Source Project

     Copyright (C) 2017 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.
@@ -15,12 +15,10 @@ 
-->

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

    android:height="24.0dp"

    android:viewportHeight="48.0"

    android:viewportWidth="48.0"

    android:viewportHeight="24.0"

    android:viewportWidth="24.0"

    android:width="24.0dp" >



    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M38.0,26.0L26.0,26.0l0.0,12.0l-4.0,0.0L22.0,26.0L10.0,26.0l0.0,-4.0l12.0,0.0L22.0,10.0l4.0,0.0l0.0,12.0l12.0,0.0l0.0,4.0z" />



        android:pathData="M18,13h-5v5c0,0.55 -0.45,1 -1,1h0c-0.55,0 -1,-0.45 -1,-1v-5H6c-0.55,0 -1,-0.45 -1,-1v0c0,-0.55 0.45,-1 1,-1h5V6c0,-0.55 0.45,-1 1,-1h0c0.55,0 1,0.45 1,1v5h5c0.55,0 1,0.45 1,1v0C19,12.55 18.55,13 18,13z"/>

</vector>

packages/SystemUI/res/layout/volume_zen_footer.xml

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ 
            android:clickable="true"

            android:contentDescription="@string/accessibility_desc_close"

            android:scaleType="center"

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

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



        <TextView

            android:id="@+id/zen_introduction_message"

packages/SystemUI/res/layout/zen_mode_panel.xml

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ 
                android:clickable="true"

                android:contentDescription="@string/accessibility_desc_close"

                android:scaleType="center"

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

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



            <TextView

                android:id="@+id/zen_introduction_message"