Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c017d5d authored by Sebastian Franco's avatar Sebastian Franco Committed by Sebastián Franco
Browse files

Fix foldable single page bug 

I did a last minute change and uploaded the wrong branch.

Bug: 268356439
Change-Id: Ia11ce681d57b7a637c01b2155b16486cf5fd648f
parent 726e9ace

src/com/android/launcher3/Workspace.java

+3 −2
Original line number Diff line number Diff line
@@ -501,7 +501,7 @@ public class Workspace<T extends View & PageIndicator> extends PagedView<T> 
    }



    private boolean isTwoPanelEnabled() {

        return mLauncher.mDeviceProfile.isTwoPanels;

        return !FOLDABLE_SINGLE_PAGE.get() && mLauncher.mDeviceProfile.isTwoPanels;

    }



    @Override
@@ -663,8 +663,9 @@ public class Workspace<T extends View & PageIndicator> extends PagedView<T> 


        // 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 {