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

Update the stack bounds for IME changes even if we're expanded.

Browse Source 
Even though the stack shouldn't animate due to IME changes when expanded, it needs to know that the IME has been shown/hidden so it can recalculate bounds.

Test: atest SystemUITests
Fixes: 130344714
Change-Id: I99a6741799eb1a0f19896d0001afa072fb29de47
This commit is contained in:
Joshua Tsuji
2019-04-19 17:18:40 -04:00
parent eaf1f8fd6d
commit 4b39591456
2 changed files with 26 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java
View File

@@ -717,12 +717,10 @@ public class BubbleStackView extends FrameLayout {
/** Moves the bubbles out of the way if they're going to be over the keyboard. */
public void onImeVisibilityChanged(boolean visible, int height) {
mStackAnimationController.setImeHeight(height + mImeOffset);
if (!mIsExpanded) {
if (visible) {
mStackAnimationController.updateBoundsForVisibleImeAndAnimate(height + mImeOffset);
} else {
mStackAnimationController.updateBoundsForInvisibleImeAndAnimate();
}
mStackAnimationController.animateForImeVisibility(visible);
}
}

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

@@ -334,41 +334,38 @@ public class StackAnimationController extends
mLayout.removeEndActionForProperty(DynamicAnimation.TRANSLATION_Y);
}
/**
* Save the IME height so that the allowable stack bounds reflect the now-visible IME, and
* animate the stack out of the way if necessary.
*/
public void updateBoundsForVisibleImeAndAnimate(int imeHeight) {
/** Save the current IME height so that we know where the stack bounds should be. */
public void setImeHeight(int imeHeight) {
mImeHeight = imeHeight;
}
/**
* Animates the stack either away from the newly visible IME, or back to its original position
* due to the IME going away.
*/
public void animateForImeVisibility(boolean imeVisible) {
final float maxBubbleY = getAllowableStackPositionRegion().bottom;
if (mStackPosition.y > maxBubbleY && mPreImeY == Float.MIN_VALUE) {
mPreImeY = mStackPosition.y;
float destinationY = Float.MIN_VALUE;
if (imeVisible) {
if (mStackPosition.y > maxBubbleY && mPreImeY == Float.MIN_VALUE) {
mPreImeY = mStackPosition.y;
destinationY = maxBubbleY;
}
} else {
if (mPreImeY > Float.MIN_VALUE) {
destinationY = mPreImeY;
mPreImeY = Float.MIN_VALUE;
}
}
if (destinationY > Float.MIN_VALUE) {
springFirstBubbleWithStackFollowing(
DynamicAnimation.TRANSLATION_Y,
getSpringForce(DynamicAnimation.TRANSLATION_Y, /* view */ null)
.setStiffness(SpringForce.STIFFNESS_LOW),
/* startVel */ 0f,
maxBubbleY);
}
}
/**
* Clear the IME height from the bounds and animate the stack back to its original position,
* assuming it wasn't moved in the meantime.
*/
public void updateBoundsForInvisibleImeAndAnimate() {
mImeHeight = 0;
if (mPreImeY > Float.MIN_VALUE) {
springFirstBubbleWithStackFollowing(
DynamicAnimation.TRANSLATION_Y,
getSpringForce(DynamicAnimation.TRANSLATION_Y, /* view */ null)
.setStiffness(SpringForce.STIFFNESS_LOW),
/* startVel */ 0f,
mPreImeY);
mPreImeY = Float.MIN_VALUE;
destinationY);
}
}