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

Commit 37a6a914 authored by Fan Zhang's avatar Fan Zhang
Browse files

Update sound setting icons 

- icon for sound setting in Settings homepage
- icon on phone muted condition card
- icon on DND condition card and DND suggestion

Bug: 77982107
Test: visual
Change-Id: I22b5223029d67de0bcb2466a45075835453a2b5f
parent 69ec1673

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -741,7 +741,7 @@ 
        <activity

            android:name=".notification.ZenSuggestionActivity"

            android:label="@string/zen_mode_settings_title"

            android:icon="@drawable/ic_zen"

            android:icon="@drawable/ic_do_not_disturb_on_24dp"

            android:theme="@android:style/Theme.NoDisplay">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

res/drawable/ic_do_not_disturb_on_24dp.xml

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

    Copyright (C) 2018 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"

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

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M12,2C6.48,2 2,6.48 2,12c0,5.52 4.48,10 10,10c5.52,0 10,-4.48 10,-10C22,6.48 17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8c0,-4.41 3.59,-8 8,-8c4.41,0 8,3.59 8,8C20,16.41 16.41,20 12,20z"/>

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M7,11h10v2h-10z"/>

</vector>

res/drawable/ic_homepage_sound.xml

+1 −1
Original line number Diff line number Diff line
@@ -32,5 +32,5 @@ 
        android:height="@dimen/dashboard_tile_foreground_image_size"

        android:start="@dimen/dashboard_tile_foreground_image_inset"

        android:top="@dimen/dashboard_tile_foreground_image_inset"

        android:drawable="@drawable/ic_settings_sound_white" />

        android:drawable="@drawable/ic_volume_up_24dp" />

</layer-list>

res/drawable/ic_notifications_off_24dp.xml

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

  Copyright (C) 2018 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:autoMirrored="true"

    android:height="24dp"

    android:viewportHeight="24.0"

    android:viewportWidth="24.0"

    android:width="24dp"

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

    <path android:fillColor="#FF000000"

          android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4C10,21.1 10.9,22 12,22z" />

    <path android:fillColor="#FF000000"

          android:pathData="M16,16L2.81,2.81L1.39,4.22l4.85,4.85C6.09,9.68 6,10.33 6,11v6H4v2h12.17l3.61,3.61l1.41,-1.41L16,16zM8,17c0,0 0.01,-6.11 0.01,-6.16L14.17,17H8z" />

    <path android:fillColor="#FF000000"

          android:pathData="M12,6.5c2.49,0 4,2.02 4,4.5v2.17l2,2V11c0,-3.07 -1.63,-5.64 -4.5,-6.32V4c0,-0.83 -0.67,-1.5 -1.5,-1.5S10.5,3.17 10.5,4v0.68C9.72,4.86 9.05,5.2 8.46,5.63L9.93,7.1C10.51,6.73 11.2,6.5 12,6.5z" />

</vector>

res/drawable/ic_volume_ringer_mute.xml

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

<!--

     Copyright (C) 2018 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:height="24dp"

        android:viewportHeight="23.4"

        android:viewportWidth="23.3"

        android:width="24dp"

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



    <group

        android:translateX="-0.85"

        android:translateY="-0.5">

        <path

            android:fillColor="#FFF"

            android:pathData="M20.73,19.46l-0.6,-0.6c0,0 0,0 0,0L5.54,4.26c-0.35,-0.35 -0.92,-0.35 -1.27,0c-0.35,0.35 -0.35,0.92 0,1.27l2.4,2.4C6.25,8.85 6,9.88 6,11v5l-2.15,2.15c-0.19,0.2 -0.19,0.51 0.01,0.71C3.95,18.95 4.07,19 4.2,19h13.53l1.73,1.73c0.35,0.35 0.92,0.35 1.27,0C21.09,20.38 21.09,19.81 20.73,19.46z" />

        <path

            android:fillColor="#FFF"

            android:pathData="M18,11c0,-3.07 -1.64,-5.64 -4.5,-6.32V4c0,-0.83 -0.67,-1.5 -1.5,-1.5S10.5,3.17 10.5,4v0.68C9.87,4.83 9.31,5.08 8.8,5.4l9.2,9.2V11z" />

        <path

            android:fillColor="#FFF"

            android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4C10,21.1 10.9,22 12,22z" />

    </group>



</vector>