From 4d59649ad1c74ace78f26d256a0eecac3014198f Mon Sep 17 00:00:00 2001 From: Michael Jurka Date: Mon, 16 Jan 2012 06:43:49 -0800 Subject: [PATCH] Removing dead code Change-Id: I712144b0beb81387efd4c4b59087594e9832d116 --- src/com/android/launcher2/Folder.java | 5 +---- src/com/android/launcher2/HandleView.java | 3 +-- src/com/android/launcher2/Launcher.java | 1 - src/com/android/launcher2/PagedViewIcon.java | 6 ------ .../android/launcher2/PagedViewWidget.java | 20 ------------------- 5 files changed, 2 insertions(+), 33 deletions(-) diff --git a/src/com/android/launcher2/Folder.java b/src/com/android/launcher2/Folder.java index f5bd7dbbbf..08d33159f8 100644 --- a/src/com/android/launcher2/Folder.java +++ b/src/com/android/launcher2/Folder.java @@ -20,8 +20,6 @@ import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.animation.ObjectAnimator; import android.animation.PropertyValuesHolder; -import android.animation.ValueAnimator; -import android.animation.ValueAnimator.AnimatorUpdateListener; import android.content.Context; import android.content.res.Resources; import android.graphics.Rect; @@ -37,10 +35,9 @@ import android.view.Menu; import android.view.MenuItem; import android.view.MotionEvent; import android.view.View; +import android.view.View.MeasureSpec; import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityManager; -import android.view.animation.AccelerateInterpolator; -import android.view.animation.DecelerateInterpolator; import android.view.inputmethod.EditorInfo; import android.view.inputmethod.InputMethodManager; import android.widget.LinearLayout; diff --git a/src/com/android/launcher2/HandleView.java b/src/com/android/launcher2/HandleView.java index 13d07e2ddc..d77138b0a8 100644 --- a/src/com/android/launcher2/HandleView.java +++ b/src/com/android/launcher2/HandleView.java @@ -17,13 +17,12 @@ package com.android.launcher2; -import android.widget.ImageView; import android.content.Context; import android.content.res.TypedArray; import android.util.AttributeSet; import android.view.MotionEvent; -import android.view.KeyEvent; import android.view.View; +import android.widget.ImageView; import com.android.launcher.R; diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 45a9e3118f..9caa4d19d5 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -1051,7 +1051,6 @@ public final class Launcher extends Activity mAppsCustomizeTabHost.onWindowVisible(); if (!mWorkspaceLoading) { final ViewTreeObserver observer = mWorkspace.getViewTreeObserver(); - final Workspace workspace = mWorkspace; // We want to let Launcher draw itself at least once before we force it to build // layers on all the workspace pages, so that transitioning to Launcher from other // apps is nice and speedy. Usually the first call to preDraw doesn't correspond to diff --git a/src/com/android/launcher2/PagedViewIcon.java b/src/com/android/launcher2/PagedViewIcon.java index b0288dc9b6..331bc147b8 100644 --- a/src/com/android/launcher2/PagedViewIcon.java +++ b/src/com/android/launcher2/PagedViewIcon.java @@ -16,17 +16,11 @@ package com.android.launcher2; -import android.animation.ObjectAnimator; import android.content.Context; -import android.content.res.Resources; import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Paint; import android.util.AttributeSet; import android.widget.TextView; -import com.android.launcher.R; - /** * An icon on a PagedView, specifically for items in the launcher's paged view (with compound * drawables on the top). diff --git a/src/com/android/launcher2/PagedViewWidget.java b/src/com/android/launcher2/PagedViewWidget.java index e2b02a34f3..12e9c46736 100644 --- a/src/com/android/launcher2/PagedViewWidget.java +++ b/src/com/android/launcher2/PagedViewWidget.java @@ -16,18 +16,12 @@ package com.android.launcher2; -import android.animation.ObjectAnimator; import android.appwidget.AppWidgetProviderInfo; import android.content.Context; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.content.res.Resources; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.RectF; import android.util.AttributeSet; -import android.view.KeyEvent; import android.view.MotionEvent; import android.widget.ImageView; import android.widget.LinearLayout; @@ -43,9 +37,7 @@ public class PagedViewWidget extends LinearLayout { private static boolean sDeletePreviewsWhenDetachedFromWindow = true; - private final Paint mPaint = new Paint(); private ImageView mPreviewImageView; - private final RectF mTmpScaleRect = new RectF(); private String mDimensionsFormatString; @@ -146,16 +138,4 @@ public class PagedViewWidget extends LinearLayout { // we just always mark the touch event as handled. return super.onTouchEvent(event) || true; } - - @Override - protected boolean onSetAlpha(int alpha) { - return true; - } - - private void setChildrenAlpha(float alpha) { - final int childCount = getChildCount(); - for (int i = 0; i < childCount; i++) { - getChildAt(i).setAlpha(alpha); - } - } }