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

[Bouncer] Fix swipe to unlock being too fast.

Browse Source 
This is fixing swipe to unlock being too fast.

Notif layout should move with the finger as we track to show the bouner.
The exception here is when quick settings is displayed. Unfortunately,
we need to hide quick settings in order to show the bouncer.

Bug: 247833995
Test: Manual on device
Change-Id: Id8e71ec9948dee54dfd3214f48446fc1e30bac49
This commit is contained in:
Aaron Liu
2022-09-22 15:44:14 -07:00
parent 4b73f2a5eb
commit 16ef7aa227
2 changed files with 38 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
View File

@@ -1318,7 +1318,9 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
+ mAmbientState.getOverExpansion()
- getCurrentOverScrollAmount(false /* top */);
float fraction = mAmbientState.getExpansionFraction();
if (mAmbientState.isBouncerInTransit()) {
// If we are on quick settings, we need to quickly hide it to show the bouncer to avoid an
// overlap. Otherwise, we maintain the normal fraction for smoothness.
if (mAmbientState.isBouncerInTransit() && mQsExpansionFraction > 0f) {
fraction = BouncerPanelExpansionCalculator.aboutToShowBouncerProgress(fraction);
}
final float stackY = MathUtils.lerp(0, endTopPosition, fraction);

35
packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutTest.java
View File

@@ -55,6 +55,7 @@ import android.view.ViewGroup;
import androidx.test.annotation.UiThreadTest;
import androidx.test.filters.SmallTest;
import com.android.keyguard.BouncerPanelExpansionCalculator;
import com.android.systemui.ExpandHelper;
import com.android.systemui.R;
import com.android.systemui.SysuiTestCase;
@@ -178,6 +179,40 @@ public class NotificationStackScrollLayoutTest extends SysuiTestCase {
doNothing().when(mNotificationShelf).setAnimationsEnabled(anyBoolean());
}
@Test
public void testUpdateStackHeight_qsExpansionGreaterThanZero() {
final float expansionFraction = 0.2f;
final float overExpansion = 50f;
mStackScroller.setQsExpansionFraction(1f);
mAmbientState.setExpansionFraction(expansionFraction);
mAmbientState.setOverExpansion(overExpansion);
when(mAmbientState.isBouncerInTransit()).thenReturn(true);
mStackScroller.setExpandedHeight(100f);
float expected = MathUtils.lerp(0, overExpansion,
BouncerPanelExpansionCalculator.aboutToShowBouncerProgress(expansionFraction));
assertThat(mAmbientState.getStackY()).isEqualTo(expected);
}
@Test
public void testUpdateStackHeight_qsExpansionZero() {
final float expansionFraction = 0.2f;
final float overExpansion = 50f;
mStackScroller.setQsExpansionFraction(0f);
mAmbientState.setExpansionFraction(expansionFraction);
mAmbientState.setOverExpansion(overExpansion);
when(mAmbientState.isBouncerInTransit()).thenReturn(true);
mStackScroller.setExpandedHeight(100f);
float expected = MathUtils.lerp(0, overExpansion, expansionFraction);
assertThat(mAmbientState.getStackY()).isEqualTo(expected);
}
@Test
public void testUpdateStackHeight_withDozeAmount_whenDozeChanging() {
final float dozeAmount = 0.5f;