commit bd91b11b83f30e38f426e3604a4d7698f8f195d6
author Winson Chung <winsonc@google.com> Thu Mar 28 17:16:06 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 28 17:16:06 2019 +0000
tree e34843593c2aee75929df92e3a82a632fce45043
parent 8f02dbc6748ab373d0bbfe4668ba38bdb80b1d72
parent 38b76942d650402c5d69182ad8a2e5d236e74899

Merge "Launcher landscape gesture nav"

quickstep/recents_ui_overrides/src/com/android/quickstep/FallbackActivityControllerHelper.java

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/FallbackActivityControllerHelper.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/FallbackActivityControllerHelper.java
index ef46b3b..8f4818b 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/FallbackActivityControllerHelper.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/FallbackActivityControllerHelper.java
@@ -59,7 +59,8 @@
     @Override
     public int getSwipeUpDestinationAndLength(DeviceProfile dp, Context context, Rect outRect) {
         LayoutUtils.calculateFallbackTaskSize(context, dp, outRect);
-        if (dp.isVerticalBarLayout()) {
+        if (dp.isVerticalBarLayout()
+                && !NavBarModeOverlayResourceObserver.isEdgeToEdgeModeEnabled(context)) {
             Rect targetInsets = dp.getInsets();
             int hotseatInset = dp.isSeascape() ? targetInsets.left : targetInsets.right;
             return dp.hotseatBarSizePx + hotseatInset;

quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java
index 9763063..07fa2a5 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java
@@ -74,7 +74,8 @@
     @Override
     public int getSwipeUpDestinationAndLength(DeviceProfile dp, Context context, Rect outRect) {
         LayoutUtils.calculateLauncherTaskSize(context, dp, outRect);
-        if (dp.isVerticalBarLayout()) {
+        if (dp.isVerticalBarLayout()
+                && !NavBarModeOverlayResourceObserver.isEdgeToEdgeModeEnabled(context)) {
             Rect targetInsets = dp.getInsets();
             int hotseatInset = dp.isSeascape() ? targetInsets.left : targetInsets.right;
             return dp.hotseatBarSizePx + hotseatInset;

quickstep/recents_ui_overrides/src/com/android/quickstep/OtherActivityInputConsumer.java

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/OtherActivityInputConsumer.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/OtherActivityInputConsumer.java
index c8dcf80..bcde13f 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/OtherActivityInputConsumer.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/OtherActivityInputConsumer.java
@@ -284,11 +284,13 @@
     }
 
     private boolean isNavBarOnRight() {
-        return mDisplayRotation == Surface.ROTATION_90 && mStableInsets.right > 0;
+        return !NavBarModeOverlayResourceObserver.isEdgeToEdgeModeEnabled(getBaseContext())
+                && mDisplayRotation == Surface.ROTATION_90 && mStableInsets.right > 0;
     }
 
     private boolean isNavBarOnLeft() {
-        return mDisplayRotation == Surface.ROTATION_270 && mStableInsets.left > 0;
+        return !NavBarModeOverlayResourceObserver.isEdgeToEdgeModeEnabled(getBaseContext())
+                && mDisplayRotation == Surface.ROTATION_270 && mStableInsets.left > 0;
     }
 
     private void startTouchTrackingForWindowAnimation(long touchTimeMs) {