commit 1ffd80162c2129aa03ed65299421b1e69c6205eb
author Michael Jurka <mikejurka@google.com> Fri Nov 16 13:15:38 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Nov 16 13:15:38 2012 -0800
tree f8f6ac51130c3f67acce7f8b2e6267d1dc1eb0b1
parent acbdb76a6bf9953e8e80bd59a41f456c27ddfa25
parent 6c8d6123ba22c8bd523cfaf46196385cb79290ee

am 6c8d6123: am 3c42e118: Merge "Cleaning up unused code" into jb-mr1.1-dev

* commit '6c8d6123ba22c8bd523cfaf46196385cb79290ee':
  Cleaning up unused code

src/com/android/launcher2/AppsCustomizePagedView.java

diff --git a/src/com/android/launcher2/AppsCustomizePagedView.java b/src/com/android/launcher2/AppsCustomizePagedView.java
index 5580381..6a959da 100644
--- a/src/com/android/launcher2/AppsCustomizePagedView.java
+++ b/src/com/android/launcher2/AppsCustomizePagedView.java
@@ -51,7 +51,6 @@
 import android.view.Gravity;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
-import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.animation.AccelerateInterpolator;

src/com/android/launcher2/LauncherAppWidgetInfo.java

diff --git a/src/com/android/launcher2/LauncherAppWidgetInfo.java b/src/com/android/launcher2/LauncherAppWidgetInfo.java
index 602695a..f001b2b 100644
--- a/src/com/android/launcher2/LauncherAppWidgetInfo.java
+++ b/src/com/android/launcher2/LauncherAppWidgetInfo.java
@@ -19,7 +19,6 @@
 import android.appwidget.AppWidgetHostView;
 import android.content.ComponentName;
 import android.content.ContentValues;
-import android.os.Build;
 
 /**
  * Represents a widget (either instantiated or about to be) in the Launcher.

src/com/android/launcher2/LauncherModel.java

diff --git a/src/com/android/launcher2/LauncherModel.java b/src/com/android/launcher2/LauncherModel.java
index 7302310..ccf8328 100644
--- a/src/com/android/launcher2/LauncherModel.java
+++ b/src/com/android/launcher2/LauncherModel.java
@@ -578,8 +578,6 @@
         values.put(LauncherSettings.Favorites._ID, item.id);
         item.updateValuesWithCoordinates(values, item.cellX, item.cellY);
 
-        final StackTraceElement[] stackTrace = new Throwable().getStackTrace();
-
         Runnable r = new Runnable() {
             public void run() {
                 String transaction = "DbDebug    Add item (" + item.title + ") to db, id: "

src/com/android/launcher2/Workspace.java

diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index 4940ae0..2c44aca 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -39,7 +39,6 @@
 import android.graphics.Rect;
 import android.graphics.Region.Op;
 import android.graphics.drawable.Drawable;
-import android.os.Build;
 import android.os.IBinder;
 import android.os.Parcelable;
 import android.util.AttributeSet;