commit e174143358abb3bd8c08fe9bc42d3a2106f42ec6
author Jeremy Sim <jeremysim@google.com> Tue Jul 19 23:29:32 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 19 23:29:32 2022 +0000
tree fa0658788d86b48976b7ef738060639366e06241
parent a2e9ce3b684855fe7afd730c8ed9bd7a6f4adba6
parent d97cf8ad6e9cd3be5dfb63df57a0107bde497d22

Merge "Fix small bug with Overview action button placement" into tm-qpr-dev

quickstep/src/com/android/quickstep/views/OverviewActionsView.java

diff --git a/quickstep/src/com/android/quickstep/views/OverviewActionsView.java b/quickstep/src/com/android/quickstep/views/OverviewActionsView.java
index c9d6394..c178175 100644
--- a/quickstep/src/com/android/quickstep/views/OverviewActionsView.java
+++ b/quickstep/src/com/android/quickstep/views/OverviewActionsView.java
@@ -204,7 +204,11 @@
         if (mDp == null) {
             return;
         }
-        if (mDp.areNavButtonsInline) {
+        boolean largeScreenLandscape = mDp.isTablet && !mDp.isTwoPanels && mDp.isLandscape;
+        // If in 3-button mode, shift action buttons to accommodate 3-button layout.
+        // (Special exception for landscape tablets, where there is enough room and we don't need to
+        // shift the action buttons.)
+        if (mDp.areNavButtonsInline && !largeScreenLandscape) {
             // Add extra horizontal spacing
             int additionalPadding = mDp.hotseatBarEndOffset;
             if (isLayoutRtl()) {