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

Commit 2eda242f authored by Charles He's avatar Charles He
Browse files

StatusBar: add DISABLE2_NOTIFICATION_SHADE flag. 

Previously, DISABLE_EXPAND would disable the expansion of the status
bar. But this was only limited to the unlocked case. The status bar (and
thus the quick settings panel) could still be expanded on the lock
screen (keyguard), by swiping down from either the status bar or the
notification cards.

We introduce a new flag which would disable notification shade on all
surfaces, which will be used by DevicePolicyManager to enforce LockTask
restrictions, etc.

Bug: 65813398
Test: runtest systemui
Test: manual, by using a modified version of TestDPC and
      DevicePolicyManager

Change-Id: I364567422e0ca8837ecffa3037adc131c3cef691
parent 88803320

core/java/android/app/StatusBarManager.java

+5 −2
Original line number Diff line number Diff line
@@ -72,13 +72,16 @@ public class StatusBarManager { 
     */

    public static final int DISABLE2_QUICK_SETTINGS = 1;

    public static final int DISABLE2_SYSTEM_ICONS = 1 << 1;

    public static final int DISABLE2_NOTIFICATION_SHADE = 1 << 2;



    public static final int DISABLE2_NONE = 0x00000000;



    public static final int DISABLE2_MASK = DISABLE2_QUICK_SETTINGS | DISABLE2_SYSTEM_ICONS;

    public static final int DISABLE2_MASK = DISABLE2_QUICK_SETTINGS | DISABLE2_SYSTEM_ICONS

            | DISABLE2_NOTIFICATION_SHADE;



    @IntDef(flag = true,

            value = {DISABLE2_NONE, DISABLE2_MASK, DISABLE2_QUICK_SETTINGS, DISABLE2_SYSTEM_ICONS})

            value = {DISABLE2_NONE, DISABLE2_MASK, DISABLE2_QUICK_SETTINGS, DISABLE2_SYSTEM_ICONS,

                    DISABLE2_NOTIFICATION_SHADE})

    @Retention(RetentionPolicy.SOURCE)

    public @interface Disable2Flags {}

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

+1 −1
Original line number Diff line number Diff line
@@ -667,7 +667,7 @@ public class NotificationPanelView extends PanelView implements 
            return false;

        }

        initDownStates(event);

        if (mHeadsUpTouchHelper.onInterceptTouchEvent(event)) {

        if (mBar.panelEnabled() && mHeadsUpTouchHelper.onInterceptTouchEvent(event)) {

            mIsExpansionFromHeadsUp = true;

            MetricsLogger.count(mContext, COUNTER_PANEL_OPEN, 1);

            MetricsLogger.count(mContext, COUNTER_PANEL_OPEN_PEEK, 1);

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

+24 −2
Original line number Diff line number Diff line
@@ -479,7 +479,8 @@ public class StatusBar extends SystemUI implements DemoMode, 
    private final MetricsLogger mMetricsLogger = Dependency.get(MetricsLogger.class);



    // ensure quick settings is disabled until the current user makes it through the setup wizard

    private boolean mUserSetup = false;

    @VisibleForTesting

    protected boolean mUserSetup = false;

    private final DeviceProvisionedListener mUserSetupObserver = new DeviceProvisionedListener() {

        @Override

        public void onUserSetupChanged() {
@@ -1973,6 +1974,7 @@ public class StatusBar extends SystemUI implements DemoMode, 
        mNotificationPanel.setQsExpansionEnabled(isDeviceProvisioned()

                && (mUserSetup || mUserSwitcherController == null

                        || !mUserSwitcherController.isSimpleUserSwitcher())

                && ((mDisabled2 & StatusBarManager.DISABLE2_NOTIFICATION_SHADE) == 0)

                && ((mDisabled2 & StatusBarManager.DISABLE2_QUICK_SETTINGS) == 0)

                && !mDozing

                && !ONLY_CORE_APPS);
@@ -2528,6 +2530,8 @@ public class StatusBar extends SystemUI implements DemoMode, 
        flagdbg.append(0 != ((diff2  & StatusBarManager.DISABLE2_QUICK_SETTINGS))       ? '!' : ' ');

        flagdbg.append(0 != ((state2 & StatusBarManager.DISABLE2_SYSTEM_ICONS))         ? 'I' : 'i');

        flagdbg.append(0 != ((diff2  & StatusBarManager.DISABLE2_SYSTEM_ICONS))         ? '!' : ' ');

        flagdbg.append(0 != ((state2 & StatusBarManager.DISABLE2_NOTIFICATION_SHADE))   ? 'N' : 'n');

        flagdbg.append(0 != ((diff2  & StatusBarManager.DISABLE2_NOTIFICATION_SHADE))   ? '!' : ' ');

        flagdbg.append('>');

        Log.d(TAG, flagdbg.toString());
@@ -2554,6 +2558,13 @@ public class StatusBar extends SystemUI implements DemoMode, 
        if ((diff2 & StatusBarManager.DISABLE2_QUICK_SETTINGS) != 0) {

            updateQsExpansionEnabled();

        }



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

            updateQsExpansionEnabled();

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

                animateCollapsePanels();

            }

        }

    }



    /**
@@ -2910,7 +2921,9 @@ public class StatusBar extends SystemUI implements DemoMode, 
    }



    boolean panelsEnabled() {

        return (mDisabled1 & StatusBarManager.DISABLE_EXPAND) == 0 && !ONLY_CORE_APPS;

        return (mDisabled1 & StatusBarManager.DISABLE_EXPAND) == 0

                && (mDisabled2 & StatusBarManager.DISABLE2_NOTIFICATION_SHADE) == 0

                && !ONLY_CORE_APPS;

    }



    void makeExpandedVisible(boolean force) {
@@ -4836,6 +4849,10 @@ public class StatusBar extends SystemUI implements DemoMode, 
     * @param expandView The view to expand after going to the shade.

     */

    public void goToLockedShade(View expandView) {

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

            return;

        }



        int userId = mCurrentUserId;

        ExpandableNotificationRow row = null;

        if (expandView instanceof ExpandableNotificationRow) {
@@ -5724,6 +5741,11 @@ public class StatusBar extends SystemUI implements DemoMode, 
        }



        private boolean handleRemoteInput(View view, PendingIntent pendingIntent) {

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

                // Skip remote input as doing so will expand the notification shade.

                return true;

            }



            Object tag = view.getTag(com.android.internal.R.id.remote_input_tag);

            RemoteInput[] inputs = null;

            if (tag instanceof RemoteInput[]) {

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java

+27 −6
Original line number Diff line number Diff line
@@ -34,8 +34,8 @@ import static org.mockito.Mockito.verify; 
import static org.mockito.Mockito.when;



import android.app.Notification;

import android.app.StatusBarManager;

import android.app.trust.TrustManager;

import android.content.Context;

import android.hardware.fingerprint.FingerprintManager;

import android.metrics.LogMaker;

import android.os.Binder;
@@ -50,21 +50,17 @@ import android.service.notification.StatusBarNotification; 
import android.support.test.filters.SmallTest;

import android.support.test.metricshelper.MetricsAsserts;

import android.testing.AndroidTestingRunner;

import android.testing.LayoutInflaterBuilder;

import android.testing.TestableLooper;

import android.testing.TestableLooper.MessageHandler;

import android.testing.TestableLooper.RunWithLooper;

import android.util.DisplayMetrics;

import android.view.View;

import android.view.ViewGroup.LayoutParams;

import android.widget.FrameLayout;



import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.internal.logging.testing.FakeMetricsLogger;

import com.android.internal.statusbar.IStatusBarService;

import com.android.keyguard.KeyguardHostView.OnDismissAction;

import com.android.keyguard.KeyguardStatusView;

import com.android.systemui.R;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.assist.AssistManager;
@@ -76,7 +72,6 @@ import com.android.systemui.statusbar.KeyguardIndicationController; 
import com.android.systemui.statusbar.NotificationData;

import com.android.systemui.statusbar.NotificationData.Entry;

import com.android.systemui.statusbar.StatusBarState;

import com.android.systemui.statusbar.policy.DateView;

import com.android.systemui.statusbar.policy.DeviceProvisionedController;

import com.android.systemui.statusbar.policy.HeadsUpManager;

import com.android.systemui.statusbar.policy.KeyguardMonitor;
@@ -495,6 +490,28 @@ public class StatusBarTest extends SysuiTestCase { 
        TestableLooper.get(this).processAllMessages();

    }



    @Test

    public void testDisableExpandStatusBar() {

        mStatusBar.setBarStateForTest(StatusBarState.SHADE);

        mStatusBar.setUserSetupForTest(true);

        when(mStatusBar.isDeviceProvisioned()).thenReturn(true);



        mStatusBar.disable(StatusBarManager.DISABLE_NONE,

                StatusBarManager.DISABLE2_NOTIFICATION_SHADE, false);

        verify(mNotificationPanelView).setQsExpansionEnabled(false);

        mStatusBar.animateExpandNotificationsPanel();

        verify(mNotificationPanelView, never()).expand(anyBoolean());

        mStatusBar.animateExpandSettingsPanel(null);

        verify(mNotificationPanelView, never()).expand(anyBoolean());



        mStatusBar.disable(StatusBarManager.DISABLE_NONE, StatusBarManager.DISABLE2_NONE, false);

        verify(mNotificationPanelView).setQsExpansionEnabled(true);

        mStatusBar.animateExpandNotificationsPanel();

        verify(mNotificationPanelView).expand(anyBoolean());

        mStatusBar.animateExpandSettingsPanel(null);

        verify(mNotificationPanelView).expand(anyBoolean());

    }



    @Test

    public void testDump_DoesNotCrash() {

        mStatusBar.dump(null, new PrintWriter(new ByteArrayOutputStream()), null);
@@ -546,5 +563,9 @@ public class StatusBarTest extends SysuiTestCase { 
        public void setBarStateForTest(int state) {

            mState = state;

        }



        public void setUserSetupForTest(boolean userSetup) {

            mUserSetup = userSetup;

        }

    }

}
 
 No newline at end of file

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

+1 −1
Original line number Diff line number Diff line
@@ -529,7 +529,7 @@ public class StatusBarManagerService extends IStatusBarService.Stub { 
     */

    @Override

    public void disable2ForUser(int what, IBinder token, String pkg, int userId) {

        enforceStatusBar();

        enforceStatusBarService();



        synchronized (mLock) {

            disableLocked(userId, what, token, pkg, 2);