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

Commit cfad40b9 authored by Matt Garnes's avatar Matt Garnes Committed by Raj Yengisetty
Browse files

Fix CustomContent/CMHome bugs with settings. 

1. If Search Panel / CMHome is enabled, it would become visible
   in overview mode after any setting is toggled. Fixed.
2. If all icons on the last home screen were removed and Search Panel /
   CMHome is enabled, CMHome would become the only workspace, breaking
   most things. Fixed.

Change-Id: I5a31e8058f71922c2790c6ac43b09ed7bcbe768a
parent fd6c984a

src/com/android/launcher3/Workspace.java

+1 −6
Original line number Original line Diff line number Diff line
@@ -4354,12 +4354,7 @@ public class Workspace extends SmoothPagedView 
    }

    }





    public int getCurrentPageOffsetFromCustomContent() {

    public int getCurrentPageOffsetFromCustomContent() {

        int numCustomPages = numCustomPages();

        return getNextPage() - numCustomPages();

        // Special case where the Gel Integration page must be counted below

        if(mLauncher.isGelIntegrationEnabled() && mLauncher.isGelIntegrationSupported()) {

            numCustomPages += 1;

        }

        return getNextPage() - numCustomPages;

    }

    }





    /**

    /**