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

Merge "Fix QS and QS Footer sometimes having low alpha after expansion" into tm-qpr-dev

Browse Source
This commit is contained in:
Christian Göllner
2023-03-16 13:04:33 +00:00
committed by Android (Google) Code Review
parent e8a0ffc86c ec0dad2072
commit 23cb555fba
4 changed files with 14 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/qs/QSFragment.java
View File

@@ -636,7 +636,8 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca
&& mLastKeyguardAndExpanded == onKeyguardAndExpanded && mLastKeyguardAndExpanded == onKeyguardAndExpanded
&& mLastViewHeight == currentHeight && mLastViewHeight == currentHeight
&& mLastHeaderTranslation == headerTranslation && mLastHeaderTranslation == headerTranslation
&& mSquishinessFraction == squishinessFraction) { && mSquishinessFraction == squishinessFraction
&& mLastPanelFraction == panelExpansionFraction) {
return; return;
} }
mLastHeaderTranslation = headerTranslation; mLastHeaderTranslation = headerTranslation;

4
packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
View File

@@ -3706,10 +3706,10 @@ public final class NotificationPanelViewController implements Dumpable {
mHeightAnimator.end(); mHeightAnimator.end();
} }
} }
mQsController.setShadeExpandedHeight(mExpandedHeight);
mExpansionDragDownAmountPx = h;
mExpandedFraction = Math.min(1f, mExpandedFraction = Math.min(1f,
maxPanelHeight == 0 ? 0 : mExpandedHeight / maxPanelHeight); maxPanelHeight == 0 ? 0 : mExpandedHeight / maxPanelHeight);
mQsController.setShadeExpansion(mExpandedHeight, mExpandedFraction);
mExpansionDragDownAmountPx = h;
mAmbientState.setExpansionFraction(mExpandedFraction); mAmbientState.setExpansionFraction(mExpandedFraction);
onHeightUpdated(mExpandedHeight); onHeightUpdated(mExpandedHeight);
updatePanelExpansionAndVisibility(); updatePanelExpansionAndVisibility();

11
packages/SystemUI/src/com/android/systemui/shade/QuickSettingsController.java
View File

@@ -339,7 +339,6 @@ public class QuickSettingsController {
mFeatureFlags = featureFlags; mFeatureFlags = featureFlags;
mInteractionJankMonitor = interactionJankMonitor; mInteractionJankMonitor = interactionJankMonitor;
mShadeExpansionStateManager.addExpansionListener(this::onPanelExpansionChanged);
mLockscreenShadeTransitionController.addCallback(new LockscreenShadeTransitionCallback()); mLockscreenShadeTransitionController.addCallback(new LockscreenShadeTransitionCallback());
} }
@@ -845,8 +844,9 @@ public class QuickSettingsController {
mCollapsedOnDown = collapsedOnDown; mCollapsedOnDown = collapsedOnDown;
} }
void setShadeExpandedHeight(float shadeExpandedHeight) { void setShadeExpansion(float expandedHeight, float expandedFraction) {
mShadeExpandedHeight = shadeExpandedHeight; mShadeExpandedHeight = expandedHeight;
mShadeExpandedFraction = expandedFraction;
} }
@VisibleForTesting @VisibleForTesting
@@ -1698,11 +1698,6 @@ public class QuickSettingsController {
return false; return false;
} }
@VisibleForTesting
void onPanelExpansionChanged(ShadeExpansionChangeEvent event) {
mShadeExpandedFraction = event.getFraction();
}
/** /**
* Animate QS closing by flinging it. * Animate QS closing by flinging it.
* If QS is expanded, it will collapse into QQS and stop. * If QS is expanded, it will collapse into QQS and stop.

21
packages/SystemUI/tests/src/com/android/systemui/shade/QuickSettingsControllerTest.java
View File

@@ -275,9 +275,7 @@ public class QuickSettingsControllerTest extends SysuiTestCase {
@Test @Test
public void testPanelStaysOpenWhenClosingQs() { public void testPanelStaysOpenWhenClosingQs() {
mShadeExpansionStateManager.onPanelExpansionChanged(/* fraction= */ 1, mQsController.setShadeExpansion(/* shadeExpandedHeight= */ 1, /* expandedFraction=*/ 1);
/* expanded= */ true, /* tracking= */ false, /* dragDownPxAmount= */ 0);
mQsController.setShadeExpandedHeight(1);
float shadeExpandedHeight = mQsController.getShadeExpandedHeight(); float shadeExpandedHeight = mQsController.getShadeExpandedHeight();
mQsController.animateCloseQs(false); mQsController.animateCloseQs(false);
@@ -289,7 +287,7 @@ public class QuickSettingsControllerTest extends SysuiTestCase {
public void interceptTouchEvent_withinQs_shadeExpanded_startsQsTracking() { public void interceptTouchEvent_withinQs_shadeExpanded_startsQsTracking() {
mQsController.setQs(mQs); mQsController.setQs(mQs);
mQsController.setShadeExpandedHeight(1f); mQsController.setShadeExpansion(/* shadeExpandedHeight= */ 1, /* expandedFraction=*/ 1);
mQsController.onIntercept( mQsController.onIntercept(
createMotionEvent(0, 0, ACTION_DOWN)); createMotionEvent(0, 0, ACTION_DOWN));
mQsController.onIntercept( mQsController.onIntercept(
@@ -303,7 +301,7 @@ public class QuickSettingsControllerTest extends SysuiTestCase {
enableSplitShade(true); enableSplitShade(true);
mQsController.setQs(mQs); mQsController.setQs(mQs);
mQsController.setShadeExpandedHeight(1f); mQsController.setShadeExpansion(/* shadeExpandedHeight= */ 1, /* expandedFraction=*/ 1);
mQsController.onIntercept( mQsController.onIntercept(
createMotionEvent(0, 0, ACTION_DOWN)); createMotionEvent(0, 0, ACTION_DOWN));
mQsController.onIntercept( mQsController.onIntercept(
@@ -342,13 +340,8 @@ public class QuickSettingsControllerTest extends SysuiTestCase {
public void handleTouch_downActionInQsArea() { public void handleTouch_downActionInQsArea() {
mQsController.setQs(mQs); mQsController.setQs(mQs);
mQsController.setBarState(SHADE); mQsController.setBarState(SHADE);
mQsController.onPanelExpansionChanged( mQsController.setShadeExpansion(/* shadeExpandedHeight= */ 1, /* expandedFraction=*/ 0.5f);
new ShadeExpansionChangeEvent(
0.5f,
true,
true,
0
));
MotionEvent event = MotionEvent event =
createMotionEvent(QS_FRAME_WIDTH / 2, QS_FRAME_BOTTOM / 2, ACTION_DOWN); createMotionEvent(QS_FRAME_WIDTH / 2, QS_FRAME_BOTTOM / 2, ACTION_DOWN);
mQsController.handleTouch(event, false, false); mQsController.handleTouch(event, false, false);
@@ -385,7 +378,7 @@ public class QuickSettingsControllerTest extends SysuiTestCase {
@Test @Test
public void handleTouch_isConflictingExpansionGestureSet() { public void handleTouch_isConflictingExpansionGestureSet() {
assertThat(mQsController.isConflictingExpansionGesture()).isFalse(); assertThat(mQsController.isConflictingExpansionGesture()).isFalse();
mShadeExpansionStateManager.onPanelExpansionChanged(1f, true, false, 0f); mQsController.setShadeExpansion(/* shadeExpandedHeight= */ 1, /* expandedFraction=*/ 1);
mQsController.handleTouch(MotionEvent.obtain(0L /* downTime */, mQsController.handleTouch(MotionEvent.obtain(0L /* downTime */,
0L /* eventTime */, ACTION_DOWN, 0f /* x */, 0f /* y */, 0L /* eventTime */, ACTION_DOWN, 0f /* x */, 0f /* y */,
0 /* metaState */), false, false); 0 /* metaState */), false, false);
@@ -394,7 +387,7 @@ public class QuickSettingsControllerTest extends SysuiTestCase {
@Test @Test
public void handleTouch_isConflictingExpansionGestureSet_cancel() { public void handleTouch_isConflictingExpansionGestureSet_cancel() {
mShadeExpansionStateManager.onPanelExpansionChanged(1f, true, false, 0f); mQsController.setShadeExpansion(/* shadeExpandedHeight= */ 1, /* expandedFraction=*/ 1);
mQsController.handleTouch(createMotionEvent(0, 0, ACTION_DOWN), false, false); mQsController.handleTouch(createMotionEvent(0, 0, ACTION_DOWN), false, false);
assertThat(mQsController.isConflictingExpansionGesture()).isTrue(); assertThat(mQsController.isConflictingExpansionGesture()).isTrue();
mQsController.handleTouch(createMotionEvent(0, 0, ACTION_UP), true, true); mQsController.handleTouch(createMotionEvent(0, 0, ACTION_UP), true, true);