diff options
author | Winson Chung <winsonc@google.com> | 2012-04-26 16:29:56 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-26 16:29:56 -0700 |
commit | a706b090ce71146d08a0189b287bba461d943f22 (patch) | |
tree | 75339d15aa8bcfbad660fde8be37f8b6166c9960 /src/com/android/launcher2/AppsCustomizePagedView.java | |
parent | 7a415f852150312eb961fb9c547f2bd11661f4b6 (diff) | |
parent | 641d71d6da6c77cc32e5d0f65ccae89caed1ac34 (diff) | |
download | android_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/AppsCustomizePagedView.java')
-rw-r--r-- | src/com/android/launcher2/AppsCustomizePagedView.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher2/AppsCustomizePagedView.java b/src/com/android/launcher2/AppsCustomizePagedView.java index 40bc2ca10..3936e599c 100644 --- a/src/com/android/launcher2/AppsCustomizePagedView.java +++ b/src/com/android/launcher2/AppsCustomizePagedView.java @@ -706,7 +706,7 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen // Start the drag alphaClipPaint = null; - mLauncher.lockScreenOrientationOnLargeUI(); + mLauncher.lockScreenOrientation(); mLauncher.getWorkspace().onDragStartedWithItem(createItemInfo, outline, alphaClipPaint); mDragController.startDrag(image, preview, this, createItemInfo, DragController.DRAG_ACTION_COPY, null, scale); @@ -758,7 +758,7 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen // drop in Workspace mLauncher.exitSpringLoadedDragMode(); } - mLauncher.unlockScreenOrientationOnLargeUI(); + mLauncher.unlockScreenOrientation(); } @Override |