summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnthony Hugh <ahugh@google.com>2015-11-02 21:16:08 (GMT)
committerAnthony Hugh <ahugh@google.com>2015-11-02 21:16:08 (GMT)
commit914243ab7dd019daa1ae8fcbb538142555597acd (patch)
treef78c10919d0b35581e056516b4011850635a4c4f
parentae6139679d31e52f74aa9d6ceb40f952f14f6022 (diff)
downloadandroid_packages_apps_PackageInstaller-914243ab7dd019daa1ae8fcbb538142555597acd.zip
android_packages_apps_PackageInstaller-914243ab7dd019daa1ae8fcbb538142555597acd.tar.gz
android_packages_apps_PackageInstaller-914243ab7dd019daa1ae8fcbb538142555597acd.tar.bz2
Button bar animating when it isn't supposed to
There was an incorrect calculation for determining when the content was occluded by the button bar or not. BUG: 25164689 Change-Id: I121f6e0232da2d1536e0fbbf697e00a4f9c1841f
-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);
}