Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Split NPVC#mQsExpansionEnabled" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-06-14 14:20:53 +00:00
committed by Android (Google) Code Review
parent c3467536bb a7a9e8d680
commit c4399d63f5
3 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java
View File

@@ -362,7 +362,9 @@ public class NotificationPanelViewController extends PanelViewController {
private boolean mStackScrollerOverscrolling; private boolean mStackScrollerOverscrolling;
private boolean mQsExpansionFromOverscroll; private boolean mQsExpansionFromOverscroll;
private float mLastOverscroll; private float mLastOverscroll;
private boolean mQsExpansionEnabled = true; private boolean mQsExpansionEnabledPolicy = true;
private boolean mQsExpansionEnabledAmbient = true;
private boolean mQsExpansionEnabled = mQsExpansionEnabledPolicy && mQsExpansionEnabledAmbient;
private ValueAnimator mQsExpansionAnimator; private ValueAnimator mQsExpansionAnimator;
private FlingAnimationUtils mFlingAnimationUtils; private FlingAnimationUtils mFlingAnimationUtils;
private int mStatusBarMinHeight; private int mStatusBarMinHeight;
@@ -1427,10 +1429,16 @@ public class NotificationPanelViewController extends PanelViewController {
mAnimateNextPositionUpdate = true; mAnimateNextPositionUpdate = true;
} }
public void setQsExpansionEnabled(boolean qsExpansionEnabled) { private void setQsExpansionEnabled() {
mQsExpansionEnabled = qsExpansionEnabled; mQsExpansionEnabled = mQsExpansionEnabledPolicy && mQsExpansionEnabledAmbient;
Log.d(TAG, "Set qsExpansionEnabled: " + mQsExpansionEnabled);
if (mQs == null) return; if (mQs == null) return;
mQs.setHeaderClickable(qsExpansionEnabled); mQs.setHeaderClickable(mQsExpansionEnabled);
}
public void setQsExpansionEnabledPolicy(boolean qsExpansionEnabledPolicy) {
mQsExpansionEnabledPolicy = qsExpansionEnabledPolicy;
setQsExpansionEnabled();
} }
@Override @Override
@@ -2182,17 +2190,19 @@ public class NotificationPanelViewController extends PanelViewController {
private void onNotificationScrolled(int newScrollPosition) { private void onNotificationScrolled(int newScrollPosition) {
// Since this is an overscroller, sometimes the scrollY can be temporarily negative // Since this is an overscroller, sometimes the scrollY can be temporarily negative
// (when overscrollng on the top and flinging). Let's // (when overscrollng on the top and flinging). Let's
updateQSExpansionEnabled(); updateQSExpansionEnabledAmbient();
} }
@Override @Override
public void setIsShadeOpening(boolean opening) { public void setIsShadeOpening(boolean opening) {
mAmbientState.setIsShadeOpening(opening); mAmbientState.setIsShadeOpening(opening);
updateQSExpansionEnabled(); updateQSExpansionEnabledAmbient();
} }
private void updateQSExpansionEnabled() { private void updateQSExpansionEnabledAmbient() {
setQsExpansionEnabled(mAmbientState.getScrollY() <= 0 && !mAmbientState.isShadeOpening()); mQsExpansionEnabledAmbient =
mAmbientState.getScrollY() <= 0 && !mAmbientState.isShadeOpening();
setQsExpansionEnabled();
} }
/** /**

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

@@ -1694,7 +1694,7 @@ public class StatusBar extends SystemUI implements DemoMode,
&& ((mDisabled2 & StatusBarManager.DISABLE2_QUICK_SETTINGS) == 0) && ((mDisabled2 & StatusBarManager.DISABLE2_QUICK_SETTINGS) == 0)
&& !mDozing && !mDozing
&& !ONLY_CORE_APPS; && !ONLY_CORE_APPS;
mNotificationPanelViewController.setQsExpansionEnabled(expandEnabled); mNotificationPanelViewController.setQsExpansionEnabledPolicy(expandEnabled);
Log.d(TAG, "updateQsExpansionEnabled - QS Expand enabled: " + expandEnabled); Log.d(TAG, "updateQsExpansionEnabled - QS Expand enabled: " + expandEnabled);
} }

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

@@ -755,7 +755,7 @@ public class StatusBarTest extends SysuiTestCase {
when(mCommandQueue.panelsEnabled()).thenReturn(false); when(mCommandQueue.panelsEnabled()).thenReturn(false);
mStatusBar.disable(DEFAULT_DISPLAY, StatusBarManager.DISABLE_NONE, mStatusBar.disable(DEFAULT_DISPLAY, StatusBarManager.DISABLE_NONE,
StatusBarManager.DISABLE2_NOTIFICATION_SHADE, false); StatusBarManager.DISABLE2_NOTIFICATION_SHADE, false);
verify(mNotificationPanelViewController).setQsExpansionEnabled(false); verify(mNotificationPanelViewController).setQsExpansionEnabledPolicy(false);
mStatusBar.animateExpandNotificationsPanel(); mStatusBar.animateExpandNotificationsPanel();
verify(mNotificationPanelViewController, never()).expand(anyBoolean()); verify(mNotificationPanelViewController, never()).expand(anyBoolean());
mStatusBar.animateExpandSettingsPanel(null); mStatusBar.animateExpandSettingsPanel(null);
@@ -764,7 +764,7 @@ public class StatusBarTest extends SysuiTestCase {
when(mCommandQueue.panelsEnabled()).thenReturn(true); when(mCommandQueue.panelsEnabled()).thenReturn(true);
mStatusBar.disable(DEFAULT_DISPLAY, StatusBarManager.DISABLE_NONE, mStatusBar.disable(DEFAULT_DISPLAY, StatusBarManager.DISABLE_NONE,
StatusBarManager.DISABLE2_NONE, false); StatusBarManager.DISABLE2_NONE, false);
verify(mNotificationPanelViewController).setQsExpansionEnabled(true); verify(mNotificationPanelViewController).setQsExpansionEnabledPolicy(true);
mStatusBar.animateExpandNotificationsPanel(); mStatusBar.animateExpandNotificationsPanel();
verify(mNotificationPanelViewController).expandWithoutQs(); verify(mNotificationPanelViewController).expandWithoutQs();
mStatusBar.animateExpandSettingsPanel(null); mStatusBar.animateExpandSettingsPanel(null);