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

Commit e841687a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix return condition in getWorkspacePageTranslationProvider" into udc-dev am: d756203f 

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



Change-Id: Ieef8d4827efbd137c13066fb07f3ef0f75a0e625
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 472a589a d756203f

src/com/android/launcher3/LauncherState.java

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

     */

    public PageTranslationProvider getWorkspacePageTranslationProvider(Launcher launcher) {

        if (this != SPRING_LOADED

                || this != EDIT_MODE

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

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

            return DEFAULT_PAGE_TRANSLATION_PROVIDER;

        }