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
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java
index ac367d2..899e873 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java
@@ -34,8 +34,8 @@
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.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.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;
@@ -496,6 +491,28 @@
}
@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 void setBarStateForTest(int state) {
mState = state;
}
+
+ public void setUserSetupForTest(boolean userSetup) {
+ mUserSetup = userSetup;
+ }
}
}
\ No newline at end of file