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

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

Change-Id: Ieef8d4827efbd137c13066fb07f3ef0f75a0e625
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-08-17 06:45:47 +00:00
committed by Automerger Merge Worker

View File

@@ -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;
}