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

Merge "Fix issue with resting stack position." into rvc-dev am: 4babdf879d am: e1af93b0b2 am: f4bd180848

Browse Source 
Change-Id: I6c6564acb08caf217247b66ac57384ca5a0c93fd
This commit is contained in:
Automerger Merge Worker
2020-03-09 20:49:28 +00:00
parent 9b214279e8 f4bd180848
commit 40c6619ef0
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/SystemUI/src/com/android/systemui/bubbles/animation/StackAnimationController.java
View File

@@ -118,8 +118,11 @@ public class StackAnimationController extends
/** Whether or not the stack's start position has been set. */ /** Whether or not the stack's start position has been set. */
private boolean mStackMovedToStartPosition = false; private boolean mStackMovedToStartPosition = false;
/** The most recent position in which the stack was resting on the edge of the screen. */ /**
@Nullable private PointF mRestingStackPosition; * The stack's most recent position along the edge of the screen. This is saved when the last
* bubble is removed, so that the stack can be restored in its previous position.
*/
private PointF mRestingStackPosition;
/** The height of the most recently visible IME. */ /** The height of the most recently visible IME. */
private float mImeHeight = 0f; private float mImeHeight = 0f;
@@ -465,7 +468,6 @@ public class StackAnimationController extends
.addEndListener((animation, canceled, endValue, endVelocity) -> { .addEndListener((animation, canceled, endValue, endVelocity) -> {
if (!canceled) { if (!canceled) {
mRestingStackPosition = new PointF();
mRestingStackPosition.set(mStackPosition); mRestingStackPosition.set(mStackPosition);
springFirstBubbleWithStackFollowing(property, spring, endVelocity, springFirstBubbleWithStackFollowing(property, spring, endVelocity,
@@ -853,7 +855,12 @@ public class StackAnimationController extends
public void setStackPosition(PointF pos) { public void setStackPosition(PointF pos) {
Log.d(TAG, String.format("Setting position to (%f, %f).", pos.x, pos.y)); Log.d(TAG, String.format("Setting position to (%f, %f).", pos.x, pos.y));
mStackPosition.set(pos.x, pos.y); mStackPosition.set(pos.x, pos.y);
mRestingStackPosition = mStackPosition;
if (mRestingStackPosition == null) {
mRestingStackPosition = new PointF();
}
mRestingStackPosition.set(mStackPosition);
// If we're not the active controller, we don't want to physically move the bubble views. // If we're not the active controller, we don't want to physically move the bubble views.
if (isActiveController()) { if (isActiveController()) {