diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-06-06 22:45:47 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-06-06 22:45:47 +0000 |
commit | 19f7c6fefb6b1d7d4951567a9744cb3209f43f35 (patch) | |
tree | f0654451556adf8e58aea972d6dccd00644660ac /src | |
parent | 8278148e415785676c746459525d0bc66f1eb72c (diff) | |
parent | 0b1cb75ee8384528721f66fd1881013c53e5d750 (diff) | |
download | android_packages_apps_Trebuchet-19f7c6fefb6b1d7d4951567a9744cb3209f43f35.tar.gz android_packages_apps_Trebuchet-19f7c6fefb6b1d7d4951567a9744cb3209f43f35.tar.bz2 android_packages_apps_Trebuchet-19f7c6fefb6b1d7d4951567a9744cb3209f43f35.zip |
Merge "Disable seamless rotation for 3 and 2 button mode" into ub-launcher3-qt-dev
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 2 | ||||
-rw-r--r-- | src/com/android/launcher3/states/RotationHelper.java | 9 |
2 files changed, 8 insertions, 3 deletions
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; } |