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

Commit 6a3f0503 authored by Kensuke Miyagi's avatar Kensuke Miyagi Committed by Android (Google) Code Review
Browse files

Merge "Guard Notification Panel against DISABLE2_NOTIFICATION_SHADE"

parents 03622914 6eca35f3

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

+1 −1
Original line number Diff line number Diff line
@@ -1730,7 +1730,7 @@ public class StatusBar extends SystemUI implements DemoMode, 


        if ((diff2 & StatusBarManager.DISABLE2_NOTIFICATION_SHADE) != 0) {

            updateQsExpansionEnabled();

            if ((state1 & StatusBarManager.DISABLE2_NOTIFICATION_SHADE) != 0) {

            if ((state2 & StatusBarManager.DISABLE2_NOTIFICATION_SHADE) != 0) {

                mShadeController.animateCollapsePanels();

            }

        }

services/core/java/com/android/server/policy/PhoneWindowManager.java

+2 −0
Original line number Diff line number Diff line
@@ -5432,6 +5432,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                return "LONG_PRESS_HOME_ALL_APPS";

            case LONG_PRESS_HOME_ASSIST:

                return "LONG_PRESS_HOME_ASSIST";

            case LONG_PRESS_HOME_NOTIFICATION_PANEL:

                return "LONG_PRESS_HOME_NOTIFICATION_PANEL";

            default:

                return Integer.toString(behavior);

        }

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

+17 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.server.statusbar;



import static android.app.StatusBarManager.DISABLE2_GLOBAL_ACTIONS;

import static android.app.StatusBarManager.DISABLE2_NOTIFICATION_SHADE;

import static android.view.Display.DEFAULT_DISPLAY;



import android.Manifest;
@@ -613,6 +614,14 @@ public class StatusBarManagerService extends IStatusBarService.Stub implements D 
        }

    };



    /**

     * Returns true if the target disable flag (target2) is set

     */

    private boolean isDisable2FlagSet(int target2) {

        final int disabled2 = mDisplayUiState.get(DEFAULT_DISPLAY).getDisabled2();

        return ((disabled2 & target2) == target2);

    }



    // ================================================================================

    // From IStatusBarService

    // ================================================================================
@@ -620,6 +629,10 @@ public class StatusBarManagerService extends IStatusBarService.Stub implements D 
    public void expandNotificationsPanel() {

        enforceExpandStatusBar();



        if (isDisable2FlagSet(DISABLE2_NOTIFICATION_SHADE)) {

            return;

        }



        if (mBar != null) {

            try {

                mBar.animateExpandNotificationsPanel();
@@ -658,6 +671,10 @@ public class StatusBarManagerService extends IStatusBarService.Stub implements D 
    public void togglePanel() {

        enforceExpandStatusBar();



        if (isDisable2FlagSet(DISABLE2_NOTIFICATION_SHADE)) {

            return;

        }



        if (mBar != null) {

            try {

                mBar.togglePanel();