summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher2/Workspace.java
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2012-04-26 16:29:56 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-04-26 16:29:56 -0700
commita706b090ce71146d08a0189b287bba461d943f22 (patch)
tree75339d15aa8bcfbad660fde8be37f8b6166c9960 /src/com/android/launcher2/Workspace.java
parent7a415f852150312eb961fb9c547f2bd11661f4b6 (diff)
parent641d71d6da6c77cc32e5d0f65ccae89caed1ac34 (diff)
downloadandroid_packages_apps_Trebuchet-a706b090ce71146d08a0189b287bba461d943f22.tar.gz
android_packages_apps_Trebuchet-a706b090ce71146d08a0189b287bba461d943f22.tar.bz2
android_packages_apps_Trebuchet-a706b090ce71146d08a0189b287bba461d943f22.zip
Merge "Preventing activity from rotating while the user is dragging an item. (Bug 6240922)" into jb-dev
Diffstat (limited to 'src/com/android/launcher2/Workspace.java')
-rw-r--r--src/com/android/launcher2/Workspace.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index 29aea6f4b..892000d39 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -375,13 +375,13 @@ public class Workspace extends SmoothPagedView
public void onDragStart(DragSource source, Object info, int dragAction) {
mIsDragOccuring = true;
updateChildrenLayersEnabled();
- mLauncher.lockScreenOrientationOnLargeUI();
+ mLauncher.lockScreenOrientation();
}
public void onDragEnd() {
mIsDragOccuring = false;
updateChildrenLayersEnabled();
- mLauncher.unlockScreenOrientationOnLargeUI();
+ mLauncher.unlockScreenOrientation();
}
/**