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

Commit 23af4753 authored by John Spurlock's avatar John Spurlock Committed by Android Git Automerger
Browse files

am b18fc945: am e294fbc8: am ceacb51e: Merge "Zen: Distinct icon for DND =... 

am b18fc945: am e294fbc8: am ceacb51e: Merge "Zen: Distinct icon for DND = total silence." into mnc-dev

* commit 'b18fc945':
  Zen: Distinct icon for DND = total silence.
parents b570ded1 b18fc945

packages/SystemUI/res/drawable/ic_dnd_total_silence.xml

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

     Copyright (C) 2015 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="24.0"

    android:viewportWidth="24.0"

    android:width="24dp" >



    <path

        android:fillColor="#FFFFFFFF"

        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="#FFFFFFFF"

        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>

packages/SystemUI/res/drawable/ic_qs_dnd_on_total_silence.xml

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

    Copyright (C) 2015 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="64dp"

        android:height="64dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">



    <path

        android:fillColor="#FFFFFFFF"

        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="#FFFFFFFF"

        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>

packages/SystemUI/res/drawable/stat_sys_dnd_total_silence.xml

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

    Copyright (C) 2015 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.

-->

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

    android:insetLeft="2.5dp"

    android:insetRight="2.5dp">

    <vector

            android:width="17dp"

            android:height="17dp"

            android:viewportWidth="24.0"

            android:viewportHeight="24.0">

        <path

            android:fillColor="#FFFFFFFF"

            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="#FFFFFFFF"

            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>

</inset>

packages/SystemUI/res/layout/volume_zen_footer.xml

+1 −2
Original line number Original line Diff line number Diff line
@@ -41,8 +41,7 @@ 
            android:layout_width="@dimen/volume_button_size"

            android:layout_width="@dimen/volume_button_size"

            android:layout_height="@dimen/volume_button_size"

            android:layout_height="@dimen/volume_button_size"

            android:layout_marginEnd="7dp"

            android:layout_marginEnd="7dp"

            android:scaleType="center"

            android:scaleType="center" />

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





        <LinearLayout

        <LinearLayout

            android:layout_width="0dp"

            android:layout_width="0dp"

packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -112,7 +112,7 @@ public class DndTile extends QSTile<QSTile.BooleanState> { 
                        R.string.accessibility_quick_settings_dnd_priority_on);

                        R.string.accessibility_quick_settings_dnd_priority_on);

                break;

                break;

            case Global.ZEN_MODE_NO_INTERRUPTIONS:

            case Global.ZEN_MODE_NO_INTERRUPTIONS:

                state.icon = ResourceIcon.get(R.drawable.ic_qs_dnd_on);

                state.icon = ResourceIcon.get(R.drawable.ic_qs_dnd_on_total_silence);

                state.label = mContext.getString(R.string.quick_settings_dnd_none_label);

                state.label = mContext.getString(R.string.quick_settings_dnd_none_label);

                state.contentDescription = mContext.getString(

                state.contentDescription = mContext.getString(

                        R.string.accessibility_quick_settings_dnd_none_on);

                        R.string.accessibility_quick_settings_dnd_none_on);