diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2019-06-06 15:58:04 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-06 15:58:04 -0700 |
commit | bbbfc62c638fd7ed1d3cdb3348cedbb2f245f4a6 (patch) | |
tree | d5b6095d865f51eb18611af57ab03befe957ee39 | |
parent | 9788fbda66b96d1e72b66c45f669727ea02368ed (diff) | |
parent | 19f7c6fefb6b1d7d4951567a9744cb3209f43f35 (diff) | |
download | android_packages_apps_Trebuchet-bbbfc62c638fd7ed1d3cdb3348cedbb2f245f4a6.tar.gz android_packages_apps_Trebuchet-bbbfc62c638fd7ed1d3cdb3348cedbb2f245f4a6.tar.bz2 android_packages_apps_Trebuchet-bbbfc62c638fd7ed1d3cdb3348cedbb2f245f4a6.zip |
Merge "Disable seamless rotation for 3 and 2 button mode" into ub-launcher3-qt-dev
am: 19f7c6fefb
Change-Id: Iec2636f14a157e9a9b5e9c47e1c258b9158dc942
4 files changed, 17 insertions, 10 deletions
diff --git a/quickstep/src/com/android/launcher3/uioverrides/UiFactory.java b/quickstep/src/com/android/launcher3/uioverrides/UiFactory.java index 489174614..97cd38a11 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/UiFactory.java +++ b/quickstep/src/com/android/launcher3/uioverrides/UiFactory.java @@ -47,7 +47,6 @@ import com.android.launcher3.LauncherStateManager; import com.android.launcher3.LauncherStateManager.StateHandler; import com.android.launcher3.QuickstepAppTransitionManagerImpl; import com.android.launcher3.Utilities; -import com.android.launcher3.dragndrop.DragLayer; import com.android.launcher3.proxy.ProxyActivityStarter; import com.android.launcher3.proxy.StartActivityParams; import com.android.quickstep.OverviewInteractionState; @@ -64,10 +63,14 @@ import java.util.zip.Deflater; public class UiFactory extends RecentsUiFactory { - public static Runnable enableLiveTouchControllerChanges(DragLayer dl) { - NavigationModeChangeListener listener = m -> dl.recreateControllers(); - SysUINavigationMode mode = SysUINavigationMode.INSTANCE.get(dl.getContext()); - mode.addModeChangeListener(listener); + public static Runnable enableLiveUIChanges(Launcher launcher) { + NavigationModeChangeListener listener = m -> { + launcher.getDragLayer().recreateControllers(); + launcher.getRotationHelper().setRotationHadDifferentUI(m != Mode.NO_BUTTON); + }; + SysUINavigationMode mode = SysUINavigationMode.INSTANCE.get(launcher); + SysUINavigationMode.Mode m = mode.addModeChangeListener(listener); + launcher.getRotationHelper().setRotationHadDifferentUI(m != Mode.NO_BUTTON); return () -> mode.removeModeChangeListener(listener); } diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 855535b0f..1afbe0098 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -1063,7 +1063,7 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns, // Setup the drag layer mDragLayer.setup(mDragController, mWorkspace); - mCancelTouchController = UiFactory.enableLiveTouchControllerChanges(mDragLayer); + mCancelTouchController = UiFactory.enableLiveUIChanges(this); mWorkspace.setup(mDragController); // Until the workspace is bound, ensure that we keep the wallpaper offset locked to the diff --git a/src/com/android/launcher3/states/RotationHelper.java b/src/com/android/launcher3/states/RotationHelper.java index cd96d6ed8..abf90e22c 100644 --- a/src/com/android/launcher3/states/RotationHelper.java +++ b/src/com/android/launcher3/states/RotationHelper.java @@ -73,7 +73,8 @@ public class RotationHelper implements OnSharedPreferenceChangeListener { // This is used to defer setting rotation flags until the activity is being created private boolean mInitialized; - public boolean mDestroyed; + private boolean mDestroyed; + private boolean mRotationHasDifferentUI; private int mLastActivityFlags = -1; @@ -92,8 +93,12 @@ public class RotationHelper implements OnSharedPreferenceChangeListener { } } + public void setRotationHadDifferentUI(boolean rotationHasDifferentUI) { + mRotationHasDifferentUI = rotationHasDifferentUI; + } + public boolean homeScreenCanRotate() { - return mIgnoreAutoRotateSettings || mAutoRotateEnabled + return mRotationHasDifferentUI || mIgnoreAutoRotateSettings || mAutoRotateEnabled || mStateHandlerRequest != REQUEST_NONE || mLauncher.getDeviceProfile().isMultiWindowMode; } diff --git a/src_ui_overrides/com/android/launcher3/uioverrides/UiFactory.java b/src_ui_overrides/com/android/launcher3/uioverrides/UiFactory.java index 550327d96..e41916cf4 100644 --- a/src_ui_overrides/com/android/launcher3/uioverrides/UiFactory.java +++ b/src_ui_overrides/com/android/launcher3/uioverrides/UiFactory.java @@ -27,7 +27,6 @@ import com.android.launcher3.DeviceProfile; import com.android.launcher3.Launcher; import com.android.launcher3.LauncherState.ScaleAndTranslation; import com.android.launcher3.LauncherStateManager.StateHandler; -import com.android.launcher3.dragndrop.DragLayer; import com.android.launcher3.graphics.RotationMode; import com.android.launcher3.util.TouchController; @@ -40,7 +39,7 @@ public class UiFactory { launcher.getDragController(), new AllAppsSwipeController(launcher)}; } - public static Runnable enableLiveTouchControllerChanges(DragLayer dl) { + public static Runnable enableLiveUIChanges(Launcher l) { return null; } |