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

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

Browse Source
This commit is contained in:
Jorim Jaggi
2016-05-18 19:30:15 +00:00
committed by Android (Google) Code Review
parent ea65985513 3070e77f91
commit 96b2fe6a4e
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java
View File

@@ -169,10 +169,12 @@ public class Divider extends SystemUI {
if (mAdjustedForIme != adjustedForIme) { if (mAdjustedForIme != adjustedForIme) {
mAdjustedForIme = adjustedForIme; mAdjustedForIme = adjustedForIme;
updateTouchable(); updateTouchable();
if (animDuration > 0) { if (!mMinimized) {
mView.setAdjustedForIme(adjustedForIme, animDuration); if (animDuration > 0) {
} else { mView.setAdjustedForIme(adjustedForIme, animDuration);
mView.setAdjustedForIme(adjustedForIme); } else {
mView.setAdjustedForIme(adjustedForIme);
}
} }
} }
}); });

6
services/core/java/com/android/server/wm/DockedStackDividerController.java
View File

@@ -300,7 +300,7 @@ public class DockedStackDividerController implements DimLayerUser {
boolean animate, WindowState imeWin, int imeHeight) { boolean animate, WindowState imeWin, int imeHeight) {
if (mAdjustedForIme != adjustedForIme || (adjustedForIme && mImeHeight != imeHeight) if (mAdjustedForIme != adjustedForIme || (adjustedForIme && mImeHeight != imeHeight)
|| mAdjustedForDivider != adjustedForDivider) { || mAdjustedForDivider != adjustedForDivider) {
if (animate) { if (animate && !mAnimatingForMinimizedDockedStack) {
startImeAdjustAnimation(adjustedForIme, adjustedForDivider, imeWin); startImeAdjustAnimation(adjustedForIme, adjustedForDivider, imeWin);
} else { } else {
// Animation might be delayed, so only notify if we don't run an animation. // 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( private void startImeAdjustAnimation(
boolean adjustedForIme, boolean adjustedForDivider, WindowState imeWin) { 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 // 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 // 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; mAnimationStart = mLastAnimationProgress;
mDividerAnimationStart = mLastDividerProgress; mDividerAnimationStart = mLastDividerProgress;
} }
mAnimatingForIme = true;
mAnimationStarted = false;
mAnimationTarget = adjustedForIme ? 1 : 0; mAnimationTarget = adjustedForIme ? 1 : 0;
mDividerAnimationTarget = adjustedForDivider ? 1 : 0; mDividerAnimationTarget = adjustedForDivider ? 1 : 0;