From 4a7d4afe87a9146b3cefef8e00581090301b698d Mon Sep 17 00:00:00 2001 From: Michael Jurka Date: Mon, 17 Jan 2011 15:31:53 -0800 Subject: Removing dead code Change-Id: Iec1e23a9764b8ef2bb1326c8502f31f5b5c8763a --- src/com/android/launcher2/AllAppsPagedView.java | 1 - src/com/android/launcher2/ApplicationInfoDropTarget.java | 1 - src/com/android/launcher2/CellLayout.java | 4 ---- src/com/android/launcher2/DeferredHandler.java | 2 +- src/com/android/launcher2/FolderIcon.java | 1 - src/com/android/launcher2/IconCache.java | 2 -- src/com/android/launcher2/InstallWidgetReceiver.java | 1 - src/com/android/launcher2/InterruptibleInOutAnimator.java | 2 -- src/com/android/launcher2/Launcher.java | 3 --- src/com/android/launcher2/PagedView.java | 4 ---- src/com/android/launcher2/PagedViewCellLayout.java | 6 ------ src/com/android/launcher2/UserFolder.java | 1 - src/com/android/launcher2/Utilities.java | 2 -- 13 files changed, 1 insertion(+), 29 deletions(-) (limited to 'src/com/android') diff --git a/src/com/android/launcher2/AllAppsPagedView.java b/src/com/android/launcher2/AllAppsPagedView.java index 8ed1f46df..ef9e3fad6 100644 --- a/src/com/android/launcher2/AllAppsPagedView.java +++ b/src/com/android/launcher2/AllAppsPagedView.java @@ -24,7 +24,6 @@ import android.content.res.Resources; import android.content.res.TypedArray; import android.graphics.Bitmap; import android.graphics.Canvas; -import android.graphics.Color; import android.graphics.drawable.Drawable; import android.util.AttributeSet; import android.view.LayoutInflater; diff --git a/src/com/android/launcher2/ApplicationInfoDropTarget.java b/src/com/android/launcher2/ApplicationInfoDropTarget.java index f9440227a..78a9d2dcc 100644 --- a/src/com/android/launcher2/ApplicationInfoDropTarget.java +++ b/src/com/android/launcher2/ApplicationInfoDropTarget.java @@ -26,7 +26,6 @@ import android.content.ComponentName; import android.content.Context; import android.graphics.PorterDuff; import android.graphics.PorterDuffColorFilter; -import android.graphics.Rect; import android.util.AttributeSet; import android.view.View; diff --git a/src/com/android/launcher2/CellLayout.java b/src/com/android/launcher2/CellLayout.java index 45de630bb..cf82abb9d 100644 --- a/src/com/android/launcher2/CellLayout.java +++ b/src/com/android/launcher2/CellLayout.java @@ -1060,10 +1060,6 @@ public class CellLayout extends ViewGroup implements Dimmable, VisibilityChanged return isVacant; } - private boolean isVacant(int originX, int originY, int spanX, int spanY) { - return isVacantIgnoring(originX, originY, spanX, spanY, null); - } - public View getChildAt(int x, int y) { final int count = getChildCount(); for (int i = 0; i < count; i++) { diff --git a/src/com/android/launcher2/DeferredHandler.java b/src/com/android/launcher2/DeferredHandler.java index 0323c7f4d..930da56aa 100644 --- a/src/com/android/launcher2/DeferredHandler.java +++ b/src/com/android/launcher2/DeferredHandler.java @@ -31,7 +31,7 @@ import android.os.MessageQueue; * This class is fifo. */ public class DeferredHandler { - private LinkedList mQueue = new LinkedList(); + private LinkedList mQueue = new LinkedList(); private MessageQueue mMessageQueue = Looper.myQueue(); private Impl mHandler = new Impl(); diff --git a/src/com/android/launcher2/FolderIcon.java b/src/com/android/launcher2/FolderIcon.java index 86c099eda..dd83c781a 100644 --- a/src/com/android/launcher2/FolderIcon.java +++ b/src/com/android/launcher2/FolderIcon.java @@ -18,7 +18,6 @@ package com.android.launcher2; import android.content.Context; import android.content.res.Resources; -import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.util.AttributeSet; import android.view.LayoutInflater; diff --git a/src/com/android/launcher2/IconCache.java b/src/com/android/launcher2/IconCache.java index 468645bcc..2e47adc9e 100644 --- a/src/com/android/launcher2/IconCache.java +++ b/src/com/android/launcher2/IconCache.java @@ -16,8 +16,6 @@ package com.android.launcher2; -import com.android.launcher.R; - import android.content.ComponentName; import android.content.Intent; import android.content.pm.PackageManager; diff --git a/src/com/android/launcher2/InstallWidgetReceiver.java b/src/com/android/launcher2/InstallWidgetReceiver.java index 970c6a5be..4f6cb8db8 100644 --- a/src/com/android/launcher2/InstallWidgetReceiver.java +++ b/src/com/android/launcher2/InstallWidgetReceiver.java @@ -184,7 +184,6 @@ public class InstallWidgetReceiver { @Override public void onClick(DialogInterface dialog, int which) { - final LauncherModel model = mLauncher.getModel(); final AppWidgetProviderInfo widgetInfo = mActivities.get(which).widgetInfo; final PendingAddWidgetInfo createInfo = new PendingAddWidgetInfo(widgetInfo, mMimeType, diff --git a/src/com/android/launcher2/InterruptibleInOutAnimator.java b/src/com/android/launcher2/InterruptibleInOutAnimator.java index be2fd048b..135fa3996 100644 --- a/src/com/android/launcher2/InterruptibleInOutAnimator.java +++ b/src/com/android/launcher2/InterruptibleInOutAnimator.java @@ -18,9 +18,7 @@ package com.android.launcher2; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; -import android.animation.ObjectAnimator; import android.animation.ValueAnimator; -import android.util.Log; /** * A convenience class for two-way animations, e.g. a fadeIn/fadeOut animation. diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 9b5dac71a..d5b218dc4 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -363,7 +363,6 @@ public final class Launcher extends Activity alphaAnim.addListener(new AnimatorListenerAdapter() { @Override public void onAnimationEnd(Animator animation) { - String tag = mHomeCustomizationDrawer.getCurrentTabTag(); mCustomizePagedView.setCustomizationFilter(newType); final float alpha = mCustomizePagedView.getAlpha(); @@ -997,7 +996,6 @@ public final class Launcher extends Activity deleteZone.setLauncher(this); deleteZone.setDragController(dragController); - int deleteZoneHandleId; final View allAppsButton = findViewById(R.id.all_apps_button); final View divider = findViewById(R.id.divider); @@ -1074,7 +1072,6 @@ public final class Launcher extends Activity // reload these every tap; you never know when they might change loadHotseats(); if (index >= 0 && index < mHotseats.length && mHotseats[index] != null) { - Intent intent = mHotseats[index]; startActivitySafely( mHotseats[index], "hotseat" diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher2/PagedView.java index bb59678f6..1965712e9 100644 --- a/src/com/android/launcher2/PagedView.java +++ b/src/com/android/launcher2/PagedView.java @@ -17,13 +17,9 @@ package com.android.launcher2; import java.util.ArrayList; -import java.util.Collection; -import java.util.TreeMap; -import java.util.TreeSet; import android.content.Context; import android.content.res.TypedArray; -import android.graphics.Bitmap; import android.graphics.Canvas; import android.graphics.Rect; import android.os.Parcel; diff --git a/src/com/android/launcher2/PagedViewCellLayout.java b/src/com/android/launcher2/PagedViewCellLayout.java index b779a973d..70ad997b6 100644 --- a/src/com/android/launcher2/PagedViewCellLayout.java +++ b/src/com/android/launcher2/PagedViewCellLayout.java @@ -17,14 +17,8 @@ package com.android.launcher2; import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.PorterDuff; import android.graphics.Rect; import android.util.AttributeSet; -import android.util.Log; import android.view.MotionEvent; import android.view.View; import android.view.ViewDebug; diff --git a/src/com/android/launcher2/UserFolder.java b/src/com/android/launcher2/UserFolder.java index d6799f75e..b362fbdf1 100644 --- a/src/com/android/launcher2/UserFolder.java +++ b/src/com/android/launcher2/UserFolder.java @@ -1,7 +1,6 @@ package com.android.launcher2; import android.content.Context; -import android.graphics.Rect; import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; diff --git a/src/com/android/launcher2/Utilities.java b/src/com/android/launcher2/Utilities.java index 03a2a528a..60f71f575 100644 --- a/src/com/android/launcher2/Utilities.java +++ b/src/com/android/launcher2/Utilities.java @@ -54,12 +54,10 @@ final class Utilities { private static int sIconTextureWidth = -1; private static int sIconTextureHeight = -1; - private static final Paint sPaint = new Paint(); private static final Paint sBlurPaint = new Paint(); private static final Paint sGlowColorPressedPaint = new Paint(); private static final Paint sGlowColorFocusedPaint = new Paint(); private static final Paint sDisabledPaint = new Paint(); - private static final Rect sBounds = new Rect(); private static final Rect sOldBounds = new Rect(); private static final Canvas sCanvas = new Canvas(); -- cgit v1.2.3