commit d756203fa7d2d833ebf891f4a80b0149f93cbcd5
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Aug 17 05:42:09 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 17 05:42:09 2023 +0000
tree 76f4268e3af3cc44c59f8ce89703535636265ead
parent 06677beec09c11aea93d374ad8ea6db6c7e4417b
parent 4bfc0ee720e4ee80035c7ef59cf2d8d095cf9d72

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

src/com/android/launcher3/LauncherState.java

diff --git a/src/com/android/launcher3/LauncherState.java b/src/com/android/launcher3/LauncherState.java
index 8b124dc..6097fb1 100644
--- a/src/com/android/launcher3/LauncherState.java
+++ b/src/com/android/launcher3/LauncherState.java
@@ -331,8 +331,7 @@
      * 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;
         }