diff options
author | Michael Jurka <mikejurka@google.com> | 2013-04-22 15:08:42 +0200 |
---|---|---|
committer | Michael Jurka <mikejurka@google.com> | 2013-04-22 15:08:42 +0200 |
commit | 032e6bad1ba588ed8a884fb8f28fb8596efac480 (patch) | |
tree | 9044ca366aa6d038124c6f8235dfaaab01d251e5 /src/com | |
parent | 579681f14399554629e28d32df7bf1e5da0b2bf5 (diff) | |
download | android_packages_apps_Trebuchet-032e6bad1ba588ed8a884fb8f28fb8596efac480.tar.gz android_packages_apps_Trebuchet-032e6bad1ba588ed8a884fb8f28fb8596efac480.tar.bz2 android_packages_apps_Trebuchet-032e6bad1ba588ed8a884fb8f28fb8596efac480.zip |
Clean up unused code
Diffstat (limited to 'src/com')
5 files changed, 4 insertions, 10 deletions
diff --git a/src/com/android/launcher2/FirstFrameAnimatorHelper.java b/src/com/android/launcher2/FirstFrameAnimatorHelper.java index 8eac7cd2c..3e6a2c7e2 100644 --- a/src/com/android/launcher2/FirstFrameAnimatorHelper.java +++ b/src/com/android/launcher2/FirstFrameAnimatorHelper.java @@ -19,11 +19,10 @@ package com.android.launcher2; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.animation.ValueAnimator; -import android.animation.Animator.AnimatorListener; import android.util.Log; -import android.view.ViewTreeObserver; import android.view.View; import android.view.ViewPropertyAnimator; +import android.view.ViewTreeObserver; /* * This is a helper class that listens to updates from the corresponding animation. diff --git a/src/com/android/launcher2/Folder.java b/src/com/android/launcher2/Folder.java index e8be3eff2..c58189cde 100644 --- a/src/com/android/launcher2/Folder.java +++ b/src/com/android/launcher2/Folder.java @@ -106,7 +106,6 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList private static String sDefaultFolderName; private static String sHintText; - private ObjectAnimator mOpenCloseAnimator; private boolean mDestroyed; @@ -421,7 +420,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList PropertyValuesHolder alpha = PropertyValuesHolder.ofFloat("alpha", 1); PropertyValuesHolder scaleX = PropertyValuesHolder.ofFloat("scaleX", 1.0f); PropertyValuesHolder scaleY = PropertyValuesHolder.ofFloat("scaleY", 1.0f); - final ObjectAnimator oa = mOpenCloseAnimator = + final ObjectAnimator oa = LauncherAnimUtils.ofPropertyValuesHolder(this, alpha, scaleX, scaleY); oa.addListener(new AnimatorListenerAdapter() { @@ -471,7 +470,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList PropertyValuesHolder alpha = PropertyValuesHolder.ofFloat("alpha", 0); PropertyValuesHolder scaleX = PropertyValuesHolder.ofFloat("scaleX", 0.9f); PropertyValuesHolder scaleY = PropertyValuesHolder.ofFloat("scaleY", 0.9f); - final ObjectAnimator oa = mOpenCloseAnimator = + final ObjectAnimator oa = LauncherAnimUtils.ofPropertyValuesHolder(this, alpha, scaleX, scaleY); oa.addListener(new AnimatorListenerAdapter() { diff --git a/src/com/android/launcher2/LauncherViewPropertyAnimator.java b/src/com/android/launcher2/LauncherViewPropertyAnimator.java index 83b745eb5..258b2f4b9 100644 --- a/src/com/android/launcher2/LauncherViewPropertyAnimator.java +++ b/src/com/android/launcher2/LauncherViewPropertyAnimator.java @@ -19,9 +19,8 @@ package com.android.launcher2; import android.animation.Animator; import android.animation.Animator.AnimatorListener; import android.animation.TimeInterpolator; -import android.animation.ValueAnimator; -import android.view.ViewPropertyAnimator; import android.view.View; +import android.view.ViewPropertyAnimator; import java.util.ArrayList; import java.util.EnumSet; diff --git a/src/com/android/launcher2/PagedViewWidget.java b/src/com/android/launcher2/PagedViewWidget.java index 1336c7a24..86ab128cd 100644 --- a/src/com/android/launcher2/PagedViewWidget.java +++ b/src/com/android/launcher2/PagedViewWidget.java @@ -128,7 +128,6 @@ public class PagedViewWidget extends LinearLayout { mIsAppWidget = false; mInfo = info; CharSequence label = info.loadLabel(pm); - final ImageView image = (ImageView) findViewById(R.id.widget_preview); final TextView name = (TextView) findViewById(R.id.widget_name); name.setText(label); final TextView dims = (TextView) findViewById(R.id.widget_dims); diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java index d4488db2e..ca9d759d2 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -94,7 +94,6 @@ public class Workspace extends SmoothPagedView private Drawable mBackground; boolean mDrawBackground = true; private float mBackgroundAlpha = 0; - private float mOverScrollMaxBackgroundAlpha = 0.0f; private float mWallpaperScrollRatio = 1.0f; private int mOriginalPageSpacing; @@ -786,7 +785,6 @@ public class Workspace extends SmoothPagedView hideScrollingIndicator(false); } } - mOverScrollMaxBackgroundAlpha = 0.0f; if (mDelayedResizeRunnable != null) { mDelayedResizeRunnable.run(); |