summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher2/PagedViewIcon.java
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2010-11-12 13:40:58 -0800
committerWinson Chung <winsonc@google.com>2010-11-15 13:44:42 -0800
commite22a8e9d3eafe569fe0f4d284c77af08c6e2fe28 (patch)
tree9193ade5a266e87dcb600739ba3e5b90f12894d8 /src/com/android/launcher2/PagedViewIcon.java
parentcbbaf9862aa160c5e397cb49b554de20981a35fe (diff)
downloadandroid_packages_apps_Trebuchet-e22a8e9d3eafe569fe0f4d284c77af08c6e2fe28.tar.gz
android_packages_apps_Trebuchet-e22a8e9d3eafe569fe0f4d284c77af08c6e2fe28.tar.bz2
android_packages_apps_Trebuchet-e22a8e9d3eafe569fe0f4d284c77af08c6e2fe28.zip
Minor fixes to Launcher
- Adding checks to prevent multiple onSetAlpha's to be called (especially now that we are using display lists) - Removing an old change to keep artificially make the last page wider - Fixing issue where you could click on an item in the paged view while the page it was on is being faded out Change-Id: I9b194565602b5200c0688da2caec9c3c829b3bb0
Diffstat (limited to 'src/com/android/launcher2/PagedViewIcon.java')
-rw-r--r--src/com/android/launcher2/PagedViewIcon.java12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/com/android/launcher2/PagedViewIcon.java b/src/com/android/launcher2/PagedViewIcon.java
index 50ba8d459..b9b9b377e 100644
--- a/src/com/android/launcher2/PagedViewIcon.java
+++ b/src/com/android/launcher2/PagedViewIcon.java
@@ -52,7 +52,7 @@ public class PagedViewIcon extends TextView implements Checkable {
private Object mIconCacheKey;
private PagedViewIconCache mIconCache;
- private int mAlpha;
+ private int mAlpha = -1;
private int mHolographicAlpha;
private boolean mIsChecked;
@@ -162,9 +162,13 @@ public class PagedViewIcon extends TextView implements Checkable {
public void setAlpha(float alpha) {
final float viewAlpha = sHolographicOutlineHelper.viewAlphaInterpolator(alpha);
final float holographicAlpha = sHolographicOutlineHelper.highlightAlphaInterpolator(alpha);
- mAlpha = (int) (viewAlpha * 255);
- mHolographicAlpha = (int) (holographicAlpha * 255);
- super.setAlpha(viewAlpha);
+ int newViewAlpha = (int) (viewAlpha * 255);
+ int newHolographicAlpha = (int) (holographicAlpha * 255);
+ if ((mAlpha != newViewAlpha) || (mHolographicAlpha != newHolographicAlpha)) {
+ mAlpha = newViewAlpha;
+ mHolographicAlpha = newHolographicAlpha;
+ super.setAlpha(viewAlpha);
+ }
}
public void invalidateCheckedImage() {