commit 2f9883f9b966a571c48ed9b2e0c905ab077be026
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Dec 21 21:12:37 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Dec 21 21:12:37 2018 +0000
tree 4ebfa47a4dcdd7067e2f4dff38e0603ab93e60f3
parent 0d4da83e29e3f373691c70e7352f285d9769aa01
parent 8a10fb5af12585cbc17495dd28d410c539e679c2

Merge "Always show back button when screen pinning, for prototype"

packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
index 6a7983a..8c17922 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
@@ -276,7 +276,9 @@
 
         @Override
         public void onBackButtonVisibilityChanged(boolean visible) {
-            getBackButton().setVisibility(visible ? VISIBLE : GONE);
+            if (!inScreenPinning()) {
+                getBackButton().setVisibility(visible ? VISIBLE : GONE);
+            }
         }
 
         @Override
@@ -940,6 +942,9 @@
     public void showPinningEnterExitToast(boolean entering) {
         if (entering) {
             mScreenPinningNotify.showPinningStartToast();
+
+            // TODO(b/112934365): remove after prototype finished, only needed to escape from pin
+            getBackButton().setVisibility(VISIBLE);
         } else {
             mScreenPinningNotify.showPinningExitToast();
         }