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

Commit 833bb0f6 authored by Amin Shaikh's avatar Amin Shaikh
Browse files

Remove unnecessary dnd mode status bar icons. 

Bug: 129398746
Test: make
Change-Id: I8b0a71b99efc007673e33c24927deab030175db8
parent 2a127a77

packages/SystemUI/res/drawable/stat_sys_zen_important.xml

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

Copyright (C) 2014 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="18dp"

            android:height="18dp"

            android:viewportWidth="24.0"

            android:viewportHeight="24.0">



        <path

            android:fillColor="#FFFFFFFF"

            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"/>

    </vector>

</inset>

packages/SystemUI/res/drawable/stat_sys_zen_none.xml

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

Copyright (C) 2014 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="48.0"

            android:viewportHeight="48.0">



        <path

            android:fillColor="#FFFFFFFF"

            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"/>

    </vector>

</inset>

packages/SystemUI/src/com/android/systemui/statusbar/phone/DemoStatusIcons.java

+1 −3
Original line number Original line Diff line number Diff line
@@ -108,9 +108,7 @@ public class DemoStatusIcons extends StatusIconContainer implements DemoMode, Da 
            }

            }

            String zen = args.getString("zen");

            String zen = args.getString("zen");

            if (zen != null) {

            if (zen != null) {

                int iconId = zen.equals("important") ? R.drawable.stat_sys_zen_important

                int iconId = zen.equals("dnd") ? R.drawable.stat_sys_dnd : 0;

                        : zen.equals("none") ? R.drawable.stat_sys_zen_none

                        : zen.equals("dnd") ? R.drawable.stat_sys_dnd : 0;

                updateSlot("zen", null, iconId);

                updateSlot("zen", null, iconId);

            }

            }

            String bt = args.getString("bluetooth");

            String bt = args.getString("bluetooth");

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java

+3 −3
Original line number Original line Diff line number Diff line
@@ -201,7 +201,7 @@ public class PhoneStatusBarPolicy 
        mIconController.setIconVisibility(mSlotAlarmClock, false);

        mIconController.setIconVisibility(mSlotAlarmClock, false);





        // zen

        // zen

        mIconController.setIcon(mSlotZen, R.drawable.stat_sys_zen_important, null);

        mIconController.setIcon(mSlotZen, R.drawable.stat_sys_dnd, null);

        mIconController.setIconVisibility(mSlotZen, false);

        mIconController.setIconVisibility(mSlotZen, false);





        // volume

        // volume
@@ -339,11 +339,11 @@ public class PhoneStatusBarPolicy 
            zenDescription = mContext.getString(R.string.quick_settings_dnd_label);

            zenDescription = mContext.getString(R.string.quick_settings_dnd_label);

        } else if (zen == Global.ZEN_MODE_NO_INTERRUPTIONS) {

        } else if (zen == Global.ZEN_MODE_NO_INTERRUPTIONS) {

            zenVisible = true;

            zenVisible = true;

            zenIconId = R.drawable.stat_sys_zen_none;

            zenIconId = R.drawable.stat_sys_dnd;

            zenDescription = mContext.getString(R.string.interruption_level_none);

            zenDescription = mContext.getString(R.string.interruption_level_none);

        } else if (zen == Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS) {

        } else if (zen == Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS) {

            zenVisible = true;

            zenVisible = true;

            zenIconId = R.drawable.stat_sys_zen_important;

            zenIconId = R.drawable.stat_sys_dnd;

            zenDescription = mContext.getString(R.string.interruption_level_priority);

            zenDescription = mContext.getString(R.string.interruption_level_priority);

        }

        }