Merge "Fix a few issues with ime adjust/minimized dock stack" into nyc-dev

2 files changed, 9 insertions, 7 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java b/packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java
index f017803d4cbf..e89c136d8772 100644
--- a/packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java
+++ b/packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java
@@ -169,10 +169,12 @@ public class Divider extends SystemUI {
                 if (mAdjustedForIme != adjustedForIme) {
                     mAdjustedForIme = adjustedForIme;
                     updateTouchable();
-                    if (animDuration > 0) {
-                        mView.setAdjustedForIme(adjustedForIme, animDuration);
-                    } else {
-                        mView.setAdjustedForIme(adjustedForIme);
+                    if (!mMinimized) {
+                        if (animDuration > 0) {
+                            mView.setAdjustedForIme(adjustedForIme, animDuration);
+                        } else {
+                            mView.setAdjustedForIme(adjustedForIme);
+                        }
                     }
                 }
             });
diff --git a/services/core/java/com/android/server/wm/DockedStackDividerController.java b/services/core/java/com/android/server/wm/DockedStackDividerController.java
index 7a387adfba26..1b31d07cf31e 100644
--- a/services/core/java/com/android/server/wm/DockedStackDividerController.java
+++ b/services/core/java/com/android/server/wm/DockedStackDividerController.java
@@ -300,7 +300,7 @@ public class DockedStackDividerController implements DimLayerUser {
             boolean animate, WindowState imeWin, int imeHeight) {
         if (mAdjustedForIme != adjustedForIme || (adjustedForIme && mImeHeight != imeHeight)
                 || mAdjustedForDivider != adjustedForDivider) {
-            if (animate) {
+            if (animate && !mAnimatingForMinimizedDockedStack) {
                 startImeAdjustAnimation(adjustedForIme, adjustedForDivider, imeWin);
             } else {
                 // Animation might be delayed, so only notify if we don't run an animation.
@@ -547,8 +547,6 @@ public class DockedStackDividerController implements DimLayerUser {
 
     private void startImeAdjustAnimation(
             boolean adjustedForIme, boolean adjustedForDivider, WindowState imeWin) {
-        mAnimatingForIme = true;
-        mAnimationStarted = false;
 
         // If we're not in an animation, the starting point depends on whether we're adjusted
         // or not. If we're already in an animation, we start from where the current animation
@@ -562,6 +560,8 @@ public class DockedStackDividerController implements DimLayerUser {
             mAnimationStart = mLastAnimationProgress;
             mDividerAnimationStart = mLastDividerProgress;
         }
+        mAnimatingForIme = true;
+        mAnimationStarted = false;
         mAnimationTarget = adjustedForIme ? 1 : 0;
         mDividerAnimationTarget = adjustedForDivider ? 1 : 0;