| commit | 98ba3fd7d0c85abd475f4decb5ee75f6e5148ab7 | [log] [tgz] |
|---|---|---|
| author | Alex Chau <alexchau@google.com> | Thu Aug 03 17:29:24 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 03 17:29:24 2023 +0000 |
| tree | 50b9c7e2608c831a84008f146da3a26fc16cbb93 | |
| parent | a2b89e6c831e33f591c26ca28499c3411d379f60 [diff] | |
| parent | e7cfae1a26c444f40188acbe31c8e35a72309c15 [diff] |
Fix return condition in getWorkspacePageTranslationProvider am: c325c686c7 am: e7cfae1a26 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24308816 Change-Id: I1384528f2dcc5011198233fe85cc5a20699202b4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/src/com/android/launcher3/LauncherState.java b/src/com/android/launcher3/LauncherState.java index bfbca65..d2ea7cc 100644 --- a/src/com/android/launcher3/LauncherState.java +++ b/src/com/android/launcher3/LauncherState.java
@@ -386,8 +386,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; }