summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2011-07-17 18:06:55 -0700
committerAdam Cohen <adamcohen@google.com>2011-07-17 18:06:55 -0700
commit95383fe41dacc45c2aa97e7f47bafebb5b7655d8 (patch)
treefa31d4a871a4d037b13cfca4beb0b214dd0a99bc /src
parent3384c7be3cf735f68a90d835627350fa48b94d48 (diff)
downloadandroid_packages_apps_Trebuchet-95383fe41dacc45c2aa97e7f47bafebb5b7655d8.tar.gz
android_packages_apps_Trebuchet-95383fe41dacc45c2aa97e7f47bafebb5b7655d8.tar.bz2
android_packages_apps_Trebuchet-95383fe41dacc45c2aa97e7f47bafebb5b7655d8.zip
Fixing bug which locks orientation inadvertently
Change-Id: I50dfdf6a6d1d4214e88931b3f623bc41cab333c2
Diffstat (limited to 'src')
-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 c5c9c282c..ba290d3f2 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -288,11 +288,13 @@ public class Workspace extends SmoothPagedView
public void onDragStart(DragSource source, Object info, int dragAction) {
mIsDragOccuring = true;
updateChildrenLayersEnabled();
+ mLauncher.lockScreenOrientation();
}
public void onDragEnd() {
mIsDragOccuring = false;
updateChildrenLayersEnabled();
+ mLauncher.unlockScreenOrientation();
}
/**
@@ -2004,7 +2006,6 @@ public class Workspace extends SmoothPagedView
mDragController.startDrag(b, dragLayerX, dragLayerY, source, child.getTag(),
DragController.DRAG_ACTION_MOVE, dragRect);
b.recycle();
- mLauncher.lockScreenOrientation();
}
void addApplicationShortcut(ShortcutInfo info, int screen, int cellX, int cellY,
@@ -3034,7 +3035,6 @@ public class Workspace extends SmoothPagedView
doDragExit(null);
((CellLayout) getChildAt(mDragInfo.screen)).onDropChild(mDragInfo.cell);
}
- mLauncher.unlockScreenOrientation();
mDragOutline = null;
mDragInfo = null;
}