diff options
Diffstat (limited to 'src/com/android')
-rw-r--r-- | src/com/android/launcher2/DropTarget.java | 11 | ||||
-rw-r--r-- | src/com/android/launcher2/Launcher.java | 4 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/com/android/launcher2/DropTarget.java b/src/com/android/launcher2/DropTarget.java index 397d46245..d627a4c2e 100644 --- a/src/com/android/launcher2/DropTarget.java +++ b/src/com/android/launcher2/DropTarget.java @@ -19,6 +19,7 @@ package com.android.launcher2; import android.content.Context; import android.graphics.PointF; import android.graphics.Rect; +import android.util.Log; /** * Interface defining an object that can receive a drag. @@ -26,6 +27,8 @@ import android.graphics.Rect; */ public interface DropTarget { + public static final String TAG = "DropTarget"; + class DragObject { public int x = -1; public int y = -1; @@ -75,28 +78,28 @@ public interface DropTarget { void onDragEnter() { dragParity++; if (dragParity != 1) { - throw new RuntimeException("onDragEnter: Drag contract violated: " + dragParity); + Log.e(TAG, "onDragEnter: Drag contract violated: " + dragParity); } } void onDragExit() { dragParity--; if (dragParity != 0) { - throw new RuntimeException("onDragExit: Drag contract violated: " + dragParity); + Log.e(TAG, "onDragExit: Drag contract violated: " + dragParity); } } @Override public void onDragStart(DragSource source, Object info, int dragAction) { if (dragParity != 0) { - throw new RuntimeException("onDragEnter: Drag contract violated: " + dragParity); + Log.e(TAG, "onDragEnter: Drag contract violated: " + dragParity); } } @Override public void onDragEnd() { if (dragParity != 0) { - throw new RuntimeException("onDragExit: Drag contract violated: " + dragParity); + Log.e(TAG, "onDragExit: Drag contract violated: " + dragParity); } } } diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 47d9ebec2..dfeb5900e 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -380,8 +380,10 @@ public final class Launcher extends Activity final String forceEnableRotation = SystemProperties.get(FORCE_ENABLE_ROTATION_PROPERTY, "false"); + boolean enableRotation = getResources().getBoolean(R.bool.allow_rotation); + // On large interfaces, we want the screen to auto-rotate based on the current orientation - if (LauncherApplication.isScreenLarge() || "true".equalsIgnoreCase(forceEnableRotation)) { + if (enableRotation || "true".equalsIgnoreCase(forceEnableRotation)) { setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED); } } |