summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorAnthony Hugh <ahugh@google.com>2015-11-03 07:37:04 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-11-03 07:37:04 +0000
commitb1daeb40c62118ebe4f4dab4de01efc865894096 (patch)
treeba1773d4c53366fcb47789034547a10274c5efac /src/com/android
parentd158e9d12388f3579f1b6d91e57d6cc9a023c81f (diff)
parent4404cc7839760c0d6baa5a7f37c7de347e0e6f87 (diff)
downloadandroid_packages_apps_PackageInstaller-b1daeb40c62118ebe4f4dab4de01efc865894096.tar.gz
android_packages_apps_PackageInstaller-b1daeb40c62118ebe4f4dab4de01efc865894096.tar.bz2
android_packages_apps_PackageInstaller-b1daeb40c62118ebe4f4dab4de01efc865894096.zip
Button bar animating when it isn\'t supposed to am: 914243ab7d am: 09ae425c5e
am: 4404cc7839 * commit '4404cc7839760c0d6baa5a7f37c7de347e0e6f87': Button bar animating when it isn't supposed to
Diffstat (limited to 'src/com/android')
-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 954d7e96..1c55e1bd 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);
}