diff options
| author | Vinod Krishnan <vinodkrishnan@google.com> | 2015-09-23 03:50:05 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-23 03:50:05 +0000 |
| commit | 10bbad66ffd7dc3325ed08fba67155623c035dcc (patch) | |
| tree | a4e3a6dd0fb4ecaa24aa71802373b5d5e08608a3 | |
| parent | aef4b9cd1bd5b225d2bb144cc751ea11c4c9dffa (diff) | |
| parent | 639283b4daf70b60e721d81a3404da7338cc6a41 (diff) | |
| download | android_packages_apps_PackageInstaller-10bbad66ffd7dc3325ed08fba67155623c035dcc.tar.gz android_packages_apps_PackageInstaller-10bbad66ffd7dc3325ed08fba67155623c035dcc.tar.bz2 android_packages_apps_PackageInstaller-10bbad66ffd7dc3325ed08fba67155623c035dcc.zip | |
am 639283b4: MNC Perms: Button bar animate to max half window height
* commit '639283b4daf70b60e721d81a3404da7338cc6a41':
MNC Perms: Button bar animate to max half window height
| -rw-r--r-- | res/values-watch/themes.xml | 2 | ||||
| -rw-r--r-- | src/com/android/packageinstaller/permission/ui/wear/ConfirmationViewHandler.java | 12 |
2 files changed, 10 insertions, 4 deletions
diff --git a/res/values-watch/themes.xml b/res/values-watch/themes.xml index e20e35c2..b75f4699 100644 --- a/res/values-watch/themes.xml +++ b/res/values-watch/themes.xml @@ -57,7 +57,7 @@ <item name="android:maxLines">3</item> <item name="android:ellipsize">marquee</item> <item name="android:layout_height">60dp</item> - <item name="android:layout_width">match_parent</item> + <item name="android:layout_width">wrap_content</item> <item name="android:drawablePadding">12dp</item> </style> </resources> 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 +} |