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

Commit d756203f authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix return condition in getWorkspacePageTranslationProvider" into udc-dev

parents 06677bee 4bfc0ee7

src/com/android/launcher3/LauncherState.java

+1 −2
Original line number Original line Diff line number Diff line
@@ -331,8 +331,7 @@ public abstract class LauncherState implements BaseState<LauncherState> { 
     * Gets the translation provider for workspace pages.

     * Gets the translation provider for workspace pages.

     */

     */

    public PageTranslationProvider getWorkspacePageTranslationProvider(Launcher launcher) {

    public PageTranslationProvider getWorkspacePageTranslationProvider(Launcher launcher) {

        if (this != SPRING_LOADED

        if (!(this == SPRING_LOADED || this == EDIT_MODE)

                || this != EDIT_MODE

                || !launcher.getDeviceProfile().isTwoPanels) {

                || !launcher.getDeviceProfile().isTwoPanels) {

            return DEFAULT_PAGE_TRANSLATION_PROVIDER;

            return DEFAULT_PAGE_TRANSLATION_PROVIDER;

        }

        }