summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnthony Hugh <ahugh@google.com>2015-11-03 07:32:40 (GMT)
committerandroid-build-merger <android-build-merger@google.com>2015-11-03 07:32:40 (GMT)
commit09ae425c5e0d46e60b464d26083aa556c9204e28 (patch)
tree835c0af06757e251aaee9bf5fb7612dac0581453
parent5b3d79ac1f28112a7d4e22357c2191c44c028b58 (diff)
parent914243ab7dd019daa1ae8fcbb538142555597acd (diff)
downloadandroid_packages_apps_PackageInstaller-09ae425c5e0d46e60b464d26083aa556c9204e28.zip
android_packages_apps_PackageInstaller-09ae425c5e0d46e60b464d26083aa556c9204e28.tar.gz
android_packages_apps_PackageInstaller-09ae425c5e0d46e60b464d26083aa556c9204e28.tar.bz2
Button bar animating when it isn\'t supposed to
am: 914243ab7d * commit '914243ab7dd019daa1ae8fcbb538142555597acd': Button bar animating when it isn't supposed to
-rw-r--r--src/com/android/packageinstaller/permission/ui/wear/ConfirmationViewHandler.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/packageinstaller/permission/ui/wear/ConfirmationViewHandler.java b/src/com/android/packageinstaller/permission/ui/wear/ConfirmationViewHandler.java
index 954d7e9..1c55e1b 100644
--- a/src/com/android/packageinstaller/permission/ui/wear/ConfirmationViewHandler.java
+++ b/src/com/android/packageinstaller/permission/ui/wear/ConfirmationViewHandler.java
@@ -279,7 +279,7 @@ public abstract class ConfirmationViewHandler implements
// Only hide the button bar if it is occluding the content or the button bar is bigger than
// half the screen
- if (contentHeight > halfScreenHeight
+ if (contentHeight > (screenHeight - buttonBarHeight)
|| buttonBarHeight > halfScreenHeight) {
mHideHandler.sendEmptyMessageDelayed(MSG_HIDE_BUTTON_BAR, 3000);
}