Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0cf46a53 authored by Tiger Huang's avatar Tiger Huang Committed by Automerger Merge Worker
Browse files

Merge "Add logic to handle cases that IME is already shown" into rvc-dev am:... 

Merge "Add logic to handle cases that IME is already shown" into rvc-dev am: b1cd7d54 am: da90e670 am: 0726adb3

Change-Id: Ibd87e8f4b0b5d29da34cfcc7f45344d6cacdab97
parents d0561d2f 0726adb3

packages/SystemUI/src/com/android/systemui/wm/DisplayImeController.java

+6 −1
Original line number Original line Diff line number Diff line
@@ -272,13 +272,18 @@ public class DisplayImeController implements DisplayController.OnDisplaysChanged 
                    }

                    }

                    mAnimation.cancel();

                    mAnimation.cancel();

                }

                }

                mAnimationDirection = show ? DIRECTION_SHOW : DIRECTION_HIDE;

                final float defaultY = mImeSourceControl.getSurfacePosition().y;

                final float defaultY = mImeSourceControl.getSurfacePosition().y;

                final float x = mImeSourceControl.getSurfacePosition().x;

                final float x = mImeSourceControl.getSurfacePosition().x;

                final float hiddenY = defaultY + imeSource.getFrame().height();

                final float hiddenY = defaultY + imeSource.getFrame().height();

                final float shownY = defaultY;

                final float shownY = defaultY;

                final float startY = show ? hiddenY : shownY;

                final float startY = show ? hiddenY : shownY;

                final float endY = show ? shownY : hiddenY;

                final float endY = show ? shownY : hiddenY;

                if (mAnimationDirection == DIRECTION_NONE && mImeShowing && show) {

                    // IME is already showing, so set seek to end

                    seekValue = shownY;

                    seek = true;

                }

                mAnimationDirection = show ? DIRECTION_SHOW : DIRECTION_HIDE;

                mImeShowing = show;

                mImeShowing = show;

                mAnimation = ValueAnimator.ofFloat(startY, endY);

                mAnimation = ValueAnimator.ofFloat(startY, endY);

                mAnimation.setDuration(

                mAnimation.setDuration(