From e28cd2fa9ebae753c79898e3b6d3ccd23e73b986 Mon Sep 17 00:00:00 2001 From: Jason Monk Date: Thu, 19 Jan 2017 14:33:05 -0500 Subject: [PATCH] Fix nav bar visibility on lock screen StatusBarKeyguardViewManager was assuming that the navigation bar was the root view in its window, which it isn't anymore. Add a getRootView() to ensure it is always the root. Change-Id: Ifeeecc1ae8d7b6c4235a1ce4767dad3919bf90e6 Fixes: 34452399 Test: lock device, tap on nav bar area --- .../statusbar/phone/StatusBarKeyguardViewManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java index 2e279b233d7f3..7e5a7da8c7db1 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java @@ -491,7 +491,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb private Runnable mMakeNavigationBarVisibleRunnable = new Runnable() { @Override public void run() { - mPhoneStatusBar.getNavigationBarView().setVisibility(View.VISIBLE); + mPhoneStatusBar.getNavigationBarView().getRootView().setVisibility(View.VISIBLE); } }; @@ -527,7 +527,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb } } else { mContainer.removeCallbacks(mMakeNavigationBarVisibleRunnable); - mPhoneStatusBar.getNavigationBarView().setVisibility(View.GONE); + mPhoneStatusBar.getNavigationBarView().getRootView().setVisibility(View.GONE); } } }