Merge "Make sure there are bubbles before animating due to IME changes." (cd320551) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java

+3 −6

Original line number	Diff line number	Diff line
		@@ -582,12 +582,9 @@ public class BubbleController implements BubbleExpandedView.OnBubbleBlockedListe
		int displayRotation) throws RemoteException {}

		@Override
		public void onImeVisibilityChanged(boolean imeVisible, int imeHeight)
		throws RemoteException {
		if (mStackView != null) {
		mStackView.post(() -> {
		mStackView.onImeVisibilityChanged(imeVisible, imeHeight);
		});
		public void onImeVisibilityChanged(boolean imeVisible, int imeHeight) {
		if (mStackView != null && mStackView.getBubbleCount() > 0) {
		mStackView.post(() -> mStackView.onImeVisibilityChanged(imeVisible, imeHeight));
		}
		}

+5 −1

Original line number	Diff line number	Diff line
		@@ -440,6 +440,10 @@ public class StackAnimationController extends
		DynamicAnimation.ViewProperty property, SpringForce spring,
		float vel, float finalPosition) {

		if (mLayout.getChildCount() == 0) {
		return;
		}

		Log.d(TAG, String.format("Springing %s to final position %f.",
		PhysicsAnimationLayout.getReadablePropertyName(property),
		finalPosition));
		@@ -489,7 +493,7 @@ public class StackAnimationController extends

		@Override
		public float getValue(StackAnimationController controller) {
		return mProperty.getValue(mLayout.getChildAt(0));
		return mLayout.getChildCount() > 0 ? mProperty.getValue(mLayout.getChildAt(0)) : 0;
		}

		@Override