diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/packageinstaller/permission/ui/wear/ConfirmationViewHandler.java | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/com/android/packageinstaller/permission/ui/wear/ConfirmationViewHandler.java b/src/com/android/packageinstaller/permission/ui/wear/ConfirmationViewHandler.java index d28866ef..b1ff52bc 100644 --- a/src/com/android/packageinstaller/permission/ui/wear/ConfirmationViewHandler.java +++ b/src/com/android/packageinstaller/permission/ui/wear/ConfirmationViewHandler.java @@ -182,8 +182,14 @@ public abstract class ConfirmationViewHandler implements if (mContent.getHeight() > mScrollingContainer.getHeight()) { mButtonBarContainer.setTranslationZ(mButtonBarFloatingHeight); mHideHandler.sendEmptyMessageDelayed(MSG_HIDE_BUTTON_BAR, 3000); - generateButtonBarAnimator(mButtonBarContainer.getHeight(), 0, 0, - mButtonBarFloatingHeight, 1000); + int maxButtonBarHeight = 0; + if (mButtonBarContainer.getHeight() >= mRoot.getHeight() / 2) { + // If the ButtonBar is bigger than half the screen, then don't + // animate all the way. + maxButtonBarHeight = mRoot.getHeight() / 2; + } + generateButtonBarAnimator(mButtonBarContainer.getHeight(), + maxButtonBarHeight, 0, mButtonBarFloatingHeight, 1000); } else { mButtonBarContainer.setTranslationY(0); mButtonBarContainer.setTranslationZ(0); @@ -282,4 +288,4 @@ public abstract class ConfirmationViewHandler implements mButtonBarAnimator.setInterpolator(mInterpolator); mButtonBarAnimator.start(); } -}
\ No newline at end of file +} |