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

Merge "Fixing not responsive tiles in split shade" into tm-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-04-07 11:50:28 +00:00
committed by Android (Google) Code Review
parent 2bc6dae0b7 c9be2225b0
commit 608ff04417
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -405,7 +405,7 @@ public class NotificationPanelViewController extends PanelViewController {
* Determines if QS should be already expanded when expanding shade. * Determines if QS should be already expanded when expanding shade.
* Used for split shade, two finger gesture as well as accessibility shortcut to QS. * Used for split shade, two finger gesture as well as accessibility shortcut to QS.
*/ */
private boolean mQsExpandImmediate; @VisibleForTesting boolean mQsExpandImmediate;
private boolean mTwoFingerQsExpandPossible; private boolean mTwoFingerQsExpandPossible;
private String mHeaderDebugInfo; private String mHeaderDebugInfo;
@@ -430,7 +430,6 @@ public class NotificationPanelViewController extends PanelViewController {
private boolean mExpandingFromHeadsUp; private boolean mExpandingFromHeadsUp;
private boolean mCollapsedOnDown; private boolean mCollapsedOnDown;
private int mPositionMinSideMargin; private int mPositionMinSideMargin;
private int mLastOrientation = -1;
private boolean mClosingWithAlphaFadeOut; private boolean mClosingWithAlphaFadeOut;
private boolean mHeadsUpAnimatingAway; private boolean mHeadsUpAnimatingAway;
private boolean mLaunchingAffordance; private boolean mLaunchingAffordance;
@@ -955,7 +954,6 @@ public class NotificationPanelViewController extends PanelViewController {
mKeyguardBottomArea = mView.findViewById(R.id.keyguard_bottom_area); mKeyguardBottomArea = mView.findViewById(R.id.keyguard_bottom_area);
mPreviewContainer = mView.findViewById(R.id.preview_container); mPreviewContainer = mView.findViewById(R.id.preview_container);
mKeyguardBottomArea.setPreviewContainer(mPreviewContainer); mKeyguardBottomArea.setPreviewContainer(mPreviewContainer);
mLastOrientation = mResources.getConfiguration().orientation;
initBottomArea(); initBottomArea();
@@ -1994,9 +1992,6 @@ public class NotificationPanelViewController extends PanelViewController {
if (!isFullyCollapsed()) { if (!isFullyCollapsed()) {
return; return;
} }
if (mShouldUseSplitNotificationShade) {
mQsExpandImmediate = true;
}
mExpectingSynthesizedDown = true; mExpectingSynthesizedDown = true;
onTrackingStarted(); onTrackingStarted();
updatePanelExpanded(); updatePanelExpanded();
@@ -3172,6 +3167,9 @@ public class NotificationPanelViewController extends PanelViewController {
mFalsingCollector.onTrackingStarted(!mKeyguardStateController.canDismissLockScreen()); mFalsingCollector.onTrackingStarted(!mKeyguardStateController.canDismissLockScreen());
super.onTrackingStarted(); super.onTrackingStarted();
mScrimController.onTrackingStarted(); mScrimController.onTrackingStarted();
if (mShouldUseSplitNotificationShade) {
mQsExpandImmediate = true;
}
if (mQsFullyExpanded) { if (mQsFullyExpanded) {
mQsExpandImmediate = true; mQsExpandImmediate = true;
setShowShelfOnly(true); setShowShelfOnly(true);
@@ -4876,7 +4874,6 @@ public class NotificationPanelViewController extends PanelViewController {
public void onConfigurationChanged(Configuration newConfig) { public void onConfigurationChanged(Configuration newConfig) {
super.onConfigurationChanged(newConfig); super.onConfigurationChanged(newConfig);
mAffordanceHelper.onConfigurationChanged(); mAffordanceHelper.onConfigurationChanged();
mLastOrientation = newConfig.orientation;
} }
} }

9
packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationPanelViewControllerTest.java
View File

@@ -947,6 +947,15 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase {
verify(mKeyguardStatusBarViewController).setAlpha(statusBarAlpha); verify(mKeyguardStatusBarViewController).setAlpha(statusBarAlpha);
} }
@Test
public void testQsToBeImmediatelyExpandedInSplitShade() {
enableSplitShade(/* enabled= */ true);
mNotificationPanelViewController.onTrackingStarted();
assertThat(mNotificationPanelViewController.mQsExpandImmediate).isTrue();
}
private void triggerPositionClockAndNotifications() { private void triggerPositionClockAndNotifications() {
mNotificationPanelViewController.closeQs(); mNotificationPanelViewController.closeQs();
} }