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

Commit 063b5f30 authored by Dave Kover's avatar Dave Kover Committed by Gerrit Code Review
Browse files

Fix GlobalActions sound panel iconography. 

The priority and none icons were using old zen icons and did not
match up with the status bar iconography. We are now in sync. Also
aligning the prefix to match the other icons present in this dialog.
Lastly, creating new drawables for the two sound options so that
we don't clash designs with the Settings view, which also used the
same icons.

Change-Id: I0a0cee6c7f0f7b014a0b2cdd95b7f7e5cb8e5f38
Ticket: CYNGNOS-2172
parent 1bd60bda

core/res/res/drawable/ic_zen_important.xml→core/res/res/drawable/ic_lock_dnd_priority.xml

+10 −8
Original line number Diff line number Diff line 
<!--

Copyright (C) 2014 The Android Open Source Project

    Copyright (c) 2016 The CyanogenMod Project



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

    you may not use this file except in compliance with the License.
@@ -16,10 +16,12 @@ Copyright (C) 2014 The Android Open Source Project 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="32dp"

        android:height="32dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

        android:viewportHeight="48.0"

        android:viewportWidth="48.0"

        android:tint="?attr/colorControlNormal">



    <path

        android:fillColor="#8A000000"

        android:pathData="M12.0,17.273l6.1800003,3.7269993 -1.6350002,-7.0290003 5.455,-4.7269993 -7.191,-0.6170006 -2.809,-6.627 -2.809,6.627 -7.191,0.6170006 5.455,4.7269993 -1.6349998,7.0290003z"/>

        android:fillColor="#000"

        android:pathData="M24,4C12.95,4,4,12.95,4,24s8.95,20,20,20s20-8.95,20-20S35.05,4,24,4z M34,26h-8v8h-4v-8h-8v-4h8v-8h4v8h8V26z" />



</vector>
 
 No newline at end of file

core/res/res/drawable/ic_lock_dnd_total_silence.xml

0 → 100644
+31 −0
Original line number Diff line number Diff line 
<!--

    Copyright (c) 2016 The CyanogenMod 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="32dp"

        android:height="32dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0"

        android:tint="?attr/colorControlNormal">



    <path

        android:fillColor="#000"

        android:pathData="M12.0,2.0C6.5,2.0 2.0,6.5 2.0,12.0s4.5,10.0 10.0,10.0s10.0,-4.5 10.0,-10.0S17.5,2.0 12.0,2.0zM12.0,20.5c-4.7,0.0 -8.5,-3.8 -8.5,-8.5S7.3,3.5 12.0,3.5s8.5,3.8 8.5,8.5S16.7,20.5 12.0,20.5z"/>



    <path

        android:fillColor="#000"

        android:pathData="M12.0,6.0c-3.3,0.0 -6.0,2.7 -6.0,6.0c0.0,3.3 2.7,6.0 6.0,6.0s6.0,-2.7 6.0,-6.0C18.0,8.7 15.4,6.0 12.0,6.0zM15.0,13.0L9.0,13.0l0.0,-2.0l6.0,0.0L15.0,13.0z"/>



</vector>
 
 No newline at end of file

core/res/res/drawable/ic_zen_none.xml→core/res/res/drawable/ic_lock_ring.xml

+27 −0
Original line number Diff line number Diff line 
<!--

Copyright (C) 2014 The Android Open Source Project

    Copyright (c) 2016 The CyanogenMod Project



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

    you may not use this file except in compliance with the License.
@@ -16,10 +16,12 @@ Copyright (C) 2014 The Android Open Source Project 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="32dp"

        android:height="32dp"

        android:viewportWidth="48.0"

        android:viewportHeight="48.0">

        android:viewportWidth="24.0"

        android:viewportHeight="24.0"

        android:tint="?attr/colorControlNormal">



    <path

        android:fillColor="#8A000000"

        android:pathData="M24.0,4.0C13.0,4.0 4.0,13.0 4.0,24.0c0.0,11.0 9.0,20.0 20.0,20.0c11.0,0.0 20.0,-9.0 20.0,-20.0C44.0,13.0 35.0,4.0 24.0,4.0zM24.0,40.0c-8.8,0.0 -16.0,-7.2 -16.0,-16.0c0.0,-3.7 1.3,-7.1 3.4,-9.8l22.4,22.4C31.1,38.7 27.7,40.0 24.0,40.0zM36.6,33.8L14.2,11.4C16.9,9.3 20.3,8.0 24.0,8.0c8.8,0.0 16.0,7.2 16.0,16.0C40.0,27.7 38.7,31.1 36.6,33.8z"/>

        android:fillColor="#000"

        android:pathData="M11.5,22.0c1.1,0.0 2.0,-0.9 2.0,-2.0l-4.0,0.0C9.5,21.1 10.4,22.0 11.5,22.0zM18.0,16.0l0.0,-5.5c0.0,-3.1 -2.1,-5.6 -5.0,-6.3L13.0,3.5C13.0,2.7 12.3,2.0 11.5,2.0C10.7,2.0 10.0,2.7 10.0,3.5l0.0,0.7c-2.9,0.7 -5.0,3.2 -5.0,6.3L5.0,16.0l-2.0,2.0l0.0,1.0l17.0,0.0l0.0,-1.0L18.0,16.0z"/>



</vector>
 
 No newline at end of file

core/res/res/drawable/ic_lock_vibrate.xml

0 → 100644
+27 −0
Original line number Diff line number Diff line 
<!--

    Copyright (c) 2016 The CyanogenMod 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="32dp"

        android:height="32dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0"

        android:tint="?attr/colorControlNormal">



    <path

        android:fillColor="#000"

        android:pathData="M0.0,15.0l2.0,0.0L2.0,9.0L0.0,9.0L0.0,15.0zM3.0,17.0l2.0,0.0L5.0,7.0L3.0,7.0L3.0,17.0zM22.0,9.0l0.0,6.0l2.0,0.0L24.0,9.0L22.0,9.0zM19.0,17.0l2.0,0.0L21.0,7.0l-2.0,0.0L19.0,17.0zM16.5,3.0l-9.0,0.0C6.7,3.0 6.0,3.7 6.0,4.5l0.0,15.0C6.0,20.3 6.7,21.0 7.5,21.0l9.0,0.0c0.8,0.0 1.5,-0.7 1.5,-1.5l0.0,-15.0C18.0,3.7 17.3,3.0 16.5,3.0zM16.0,19.0L8.0,19.0L8.0,5.0l8.0,0.0L16.0,19.0z"/>



</vector>
 
 No newline at end of file

core/res/res/layout/global_actions_silent_mode.xml

+4 −4
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
            android:layout_marginEnd="8dp"

            android:layout_marginTop="6dp"

            android:layout_marginBottom="6dp"

            android:src="@drawable/ic_zen_none"

            android:src="@drawable/ic_lock_dnd_total_silence"

            android:scaleType="center"

            android:duplicateParentState="true"

            android:background="@drawable/silent_mode_indicator"
@@ -66,7 +66,7 @@ 
            android:layout_marginEnd="8dp"

            android:layout_marginTop="6dp"

            android:layout_marginBottom="6dp"

            android:src="@drawable/ic_zen_important"

            android:src="@drawable/ic_lock_dnd_priority"

            android:scaleType="center"

            android:duplicateParentState="true"

            android:background="@drawable/silent_mode_indicator"
@@ -95,7 +95,7 @@ 
            android:layout_marginEnd="8dp"

            android:layout_marginTop="6dp"

            android:layout_marginBottom="6dp"

            android:src="@drawable/ic_audio_ring_notif_vibrate"

            android:src="@drawable/ic_lock_vibrate"

            android:scaleType="center"

            android:duplicateParentState="true"

            android:background="@drawable/silent_mode_indicator"
@@ -124,7 +124,7 @@ 
            android:layout_marginEnd="8dp"

            android:layout_marginTop="6dp"

            android:layout_marginBottom="6dp"

            android:src="@drawable/ic_audio_ring_notif"

            android:src="@drawable/ic_lock_ring"

            android:scaleType="center"

            android:duplicateParentState="true"

            android:background="@drawable/silent_mode_indicator"