Merge "Fix BEHAVIOR_SHOW_BARS_BY_TOUCH" into rvc-qpr-dev am: 484a11d3ec am: b4e08b8598

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12467683

Change-Id: Ib7b483054ed05318eeee2bada0cb9535c5908d1f

1 files changed, 3 insertions, 3 deletions

diff --git a/services/core/java/com/android/server/wm/DisplayPolicy.java b/services/core/java/com/android/server/wm/DisplayPolicy.java
index 4998624b9097..941db09f59bd 100644
--- a/services/core/java/com/android/server/wm/DisplayPolicy.java
+++ b/services/core/java/com/android/server/wm/DisplayPolicy.java
@@ -1528,7 +1528,7 @@ public class DisplayPolicy {
                             if (mInputConsumer == null) {
                                 return;
                             }
-                            showNavigationBar();
+                            showSystemBars();
                             // Any user activity always causes us to show the
                             // navigation controls, if they had been hidden.
                             // We also clear the low profile and only content
@@ -1563,13 +1563,13 @@ public class DisplayPolicy {
             }
         }
 
-        private void showNavigationBar() {
+        private void showSystemBars() {
             final InsetsSourceProvider provider = mDisplayContent.getInsetsStateController()
                     .peekSourceProvider(ITYPE_NAVIGATION_BAR);
             final InsetsControlTarget target =
                     provider != null ? provider.getControlTarget() : null;
             if (target != null) {
-                target.showInsets(Type.navigationBars(), false /* fromIme */);
+                target.showInsets(Type.systemBars(), false /* fromIme */);
             }
         }
     }