From 4bfc0ee720e4ee80035c7ef59cf2d8d095cf9d72 Mon Sep 17 00:00:00 2001 From: Alex Chau Date: Thu, 3 Aug 2023 15:32:46 +0100 Subject: [PATCH] Fix return condition in getWorkspacePageTranslationProvider - When EDIT_MODE was introduced, it added a wrong condition to make it always return DEFAULT_PAGE_TRANSLATION_PROVIDER Bug: 294228521 Test: manual Change-Id: If970949c8ab55bc67f98f987a7654ec2db89cdfb (cherry picked from commit c325c686c73498a7041a2bd85a97c03583f2526c) --- src/com/android/launcher3/LauncherState.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/com/android/launcher3/LauncherState.java b/src/com/android/launcher3/LauncherState.java index 8b124dc847..6097fb1947 100644 --- a/src/com/android/launcher3/LauncherState.java +++ b/src/com/android/launcher3/LauncherState.java @@ -331,8 +331,7 @@ public abstract class LauncherState implements BaseState { * 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; }