commit 605e5ae73e0d0bb3f0dd97ccd3096d2938f6d3b7
author Sebastián Franco <fransebas@google.com> Wed Feb 08 23:50:29 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Feb 08 23:50:29 2023 +0000
tree 8d9a501e754ac7eea2486d03a8ec3afb3da0f9f5
parent f0c4b41bf15d81de6e63b1af237a4f1161afe576
parent 00cbb5e63c16dda30e12dcd514249fbff5b224fb

Merge "Fix foldable single page bug" into tm-qpr-dev am: 00cbb5e63c

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21328431

Change-Id: Ib58ba25662e2da177752e61b015d6b17f963a2e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

src/com/android/launcher3/Workspace.java

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index fa54dcf..cfb8ca4 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -501,7 +501,7 @@
     }
 
     private boolean isTwoPanelEnabled() {
-        return mLauncher.mDeviceProfile.isTwoPanels;
+        return !FOLDABLE_SINGLE_PAGE.get() && mLauncher.mDeviceProfile.isTwoPanels;
     }
 
     @Override
@@ -663,8 +663,9 @@
 
         // Inflate the cell layout, but do not add it automatically so that we can get the newly
         // created CellLayout.
+        DeviceProfile dp = mLauncher.getDeviceProfile();
         CellLayout newScreen;
-        if (FOLDABLE_SINGLE_PAGE.get() && isTwoPanelEnabled()) {
+        if (FOLDABLE_SINGLE_PAGE.get() && dp.isTwoPanels) {
             newScreen = (CellLayout) LayoutInflater.from(getContext()).inflate(
                     R.layout.workspace_screen_foldable, this, false /* attachToRoot */);
         } else {