From 914243ab7dd019daa1ae8fcbb538142555597acd Mon Sep 17 00:00:00 2001 From: Anthony Hugh Date: Mon, 2 Nov 2015 13:16:08 -0800 Subject: 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 --- .../packageinstaller/permission/ui/wear/ConfirmationViewHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); } -- cgit v1.2.3