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

Fixed an issue where the player would flicker on when expanding

Browse Source 
Our expansion hack doesn't work if at the end of the expansion,
the shade is still appearing. We only will do it now, if the
target location isn't an appearing position.

Fixes: 153321587
Test: add media notification but no others, expand, observe smooth transition
Change-Id: Ib278882500087d133826064007fa8ab3071445a0
This commit is contained in:
Selim Cinek
2020-05-27 16:35:40 -07:00
parent 5134fd50fa
commit 9ff1bda37f
2 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2324,6 +2324,18 @@ public class NotificationPanelViewController extends PanelViewController {
}
}
@Override
protected boolean shouldExpandToTopOfClearAll(float targetHeight) {
boolean perform = super.shouldExpandToTopOfClearAll(targetHeight);
if (!perform) {
return false;
}
// Let's make sure we're not appearing but the animation will end below the appear.
// Otherwise quick settings would jump at the end of the animation.
float fraction = mNotificationStackScroller.calculateAppearFraction(targetHeight);
return fraction >= 1.0f;
}
@Override
protected boolean shouldUseDismissingAnimation() {
return mBarState != StatusBarState.SHADE && (mKeyguardStateController.canDismissLockScreen()

22
packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelViewController.java
View File

@@ -532,11 +532,8 @@ public abstract class PanelViewController {
// Hack to make the expand transition look nice when clear all button is visible - we make
// the animation only to the last notification, and then jump to the maximum panel height so
// clear all just fades in and the decelerating motion is towards the last notification.
final boolean
clearAllExpandHack =
expand && fullyExpandedClearAllVisible()
&& mExpandedHeight < getMaxPanelHeight() - getClearAllHeight()
&& !isClearAllVisible();
final boolean clearAllExpandHack = expand &&
shouldExpandToTopOfClearAll(getMaxPanelHeight() - getClearAllHeight());
if (clearAllExpandHack) {
target = getMaxPanelHeight() - getClearAllHeight();
}
@@ -601,6 +598,21 @@ public abstract class PanelViewController {
animator.start();
}
/**
* When expanding, should we expand to the top of clear all and expand immediately?
* This will make sure that the animation will stop smoothly at the end of the last notification
* before the clear all affordance.
*
* @param targetHeight the height that we would animate to, right above clear all
*
* @return true if we can expand to the top of clear all
*/
protected boolean shouldExpandToTopOfClearAll(float targetHeight) {
return fullyExpandedClearAllVisible()
&& mExpandedHeight < targetHeight
&& !isClearAllVisible();
}
protected abstract boolean shouldUseDismissingAnimation();
public String getName() {