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

Commit 32e6cb82 authored by Fabián Kozynski's avatar Fabián Kozynski
Browse files

Add quick-settings to cmd statusbar send-disable-flag 

Test: manual, use command line to check it disables
Bug: 361587414
Flag: EXEMPT adding hidden demo code
Change-Id: Ib171ebf2f7ed60280aa971378f571713040d9861
parent 028cedc3

core/java/android/app/StatusBarManager.java

+22 −2
Original line number Diff line number Diff line
@@ -1326,6 +1326,7 @@ public class StatusBarManager { 
        private boolean mClock;

        private boolean mNotificationIcons;

        private boolean mRotationSuggestion;

        private boolean mQuickSettings;



        /** @hide */

        public DisableInfo(int flags1, int flags2) {
@@ -1338,6 +1339,7 @@ public class StatusBarManager { 
            mClock = (flags1 & DISABLE_CLOCK) != 0;

            mNotificationIcons = (flags1 & DISABLE_NOTIFICATION_ICONS) != 0;

            mRotationSuggestion = (flags2 & DISABLE2_ROTATE_SUGGESTIONS) != 0;

            mQuickSettings = (flags2 & DISABLE2_QUICK_SETTINGS) != 0;

        }



        /** @hide */
@@ -1470,6 +1472,20 @@ public class StatusBarManager { 
            return mRotationSuggestion;

        }



        /**

         * @hide

         */

        public void setQuickSettingsDisabled(boolean disabled) {

            mQuickSettings = disabled;

        }



        /**

         * @hide

         */

        public boolean isQuickSettingsDisabled() {

            return mQuickSettings;

        }



        /**

         * @return {@code true} if no components are disabled (default state)

         * @hide
@@ -1478,7 +1494,7 @@ public class StatusBarManager { 
        public boolean areAllComponentsEnabled() {

            return !mStatusBarExpansion && !mNavigateHome && !mNotificationPeeking && !mRecents

                    && !mSearch && !mSystemIcons && !mClock && !mNotificationIcons

                    && !mRotationSuggestion;

                    && !mRotationSuggestion && !mQuickSettings;

        }



        /** @hide */
@@ -1492,6 +1508,7 @@ public class StatusBarManager { 
            mClock = false;

            mNotificationIcons = false;

            mRotationSuggestion = false;

            mQuickSettings = false;

        }



        /**
@@ -1502,7 +1519,7 @@ public class StatusBarManager { 
        public boolean areAllComponentsDisabled() {

            return mStatusBarExpansion && mNavigateHome && mNotificationPeeking

                    && mRecents && mSearch && mSystemIcons && mClock && mNotificationIcons

                    && mRotationSuggestion;

                    && mRotationSuggestion && mQuickSettings;

        }



        /** @hide */
@@ -1516,6 +1533,7 @@ public class StatusBarManager { 
            mClock = true;

            mNotificationIcons = true;

            mRotationSuggestion = true;

            mQuickSettings = true;

        }



        @NonNull
@@ -1533,6 +1551,7 @@ public class StatusBarManager { 
            sb.append(" mClock=").append(mClock ? "disabled" : "enabled");

            sb.append(" mNotificationIcons=").append(mNotificationIcons ? "disabled" : "enabled");

            sb.append(" mRotationSuggestion=").append(mRotationSuggestion ? "disabled" : "enabled");

            sb.append(" mQuickSettings=").append(mQuickSettings ? "disabled" : "enabled");



            return sb.toString();
@@ -1557,6 +1576,7 @@ public class StatusBarManager { 
            if (mClock) disable1 |= DISABLE_CLOCK;

            if (mNotificationIcons) disable1 |= DISABLE_NOTIFICATION_ICONS;

            if (mRotationSuggestion) disable2 |= DISABLE2_ROTATE_SUGGESTIONS;

            if (mQuickSettings) disable2 |= DISABLE2_QUICK_SETTINGS;



            return new Pair<Integer, Integer>(disable1, disable2);

        }

services/core/java/com/android/server/statusbar/StatusBarShellCommand.java

+4 −0
Original line number Diff line number Diff line
@@ -190,6 +190,9 @@ public class StatusBarShellCommand extends ShellCommand { 
                case "notification-icons":

                    info.setNotificationIconsDisabled(true);

                    break;

                case "quick-settings":

                    info.setQuickSettingsDisabled(true);

                    break;

                default:

                    break;

            }
@@ -277,6 +280,7 @@ public class StatusBarShellCommand extends ShellCommand { 
        pw.println("        system-icons        - disable system icons appearing in status bar");

        pw.println("        clock               - disable clock appearing in status bar");

        pw.println("        notification-icons  - disable notification icons from status bar");

        pw.println("        quick-settings      - disable Quick Settings");

        pw.println("");

        pw.println("  tracing (start | stop)");

        pw.println("    Start or stop SystemUI tracing");