summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2013-12-03 07:07:33 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-12-03 07:07:33 -0800
commit16fa074d824ed64c02e8ac3bca6cc7eaab6db509 (patch)
tree1ba3033d6a24d22f506056203a1a6639f197b63f
parent0c1b33dbd44d957090abe5647af7fbe1b4f5ff1a (diff)
parent1c00fd0b045179c9e6cc2dfc344cddc1a8d5b383 (diff)
downloadandroid_packages_apps_Trebuchet-16fa074d824ed64c02e8ac3bca6cc7eaab6db509.zip
android_packages_apps_Trebuchet-16fa074d824ed64c02e8ac3bca6cc7eaab6db509.tar.gz
android_packages_apps_Trebuchet-16fa074d824ed64c02e8ac3bca6cc7eaab6db509.tar.bz2
am 1c00fd0b: Fix NPE when going to All Apps in landscape
* commit '1c00fd0b045179c9e6cc2dfc344cddc1a8d5b383': Fix NPE when going to All Apps in landscape
-rw-r--r--src/com/android/launcher3/Workspace.java10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 8f3d814..e4ba743 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -2235,20 +2235,22 @@ public class Workspace extends SmoothPagedView
if (pageIndicator != null) {
pageIndicatorAlpha = new LauncherViewPropertyAnimator(pageIndicator)
.alpha(finalHotseatAndPageIndicatorAlpha).withLayer();
+ pageIndicatorAlpha.addListener(new AlphaUpdateListener(pageIndicator));
} else {
// create a dummy animation so we don't need to do null checks later
pageIndicatorAlpha = ValueAnimator.ofFloat(0, 0);
}
+
Animator hotseatAlpha = new LauncherViewPropertyAnimator(hotseat)
.alpha(finalHotseatAndPageIndicatorAlpha).withLayer();
+ hotseatAlpha.addListener(new AlphaUpdateListener(hotseat));
+
Animator searchBarAlpha = new LauncherViewPropertyAnimator(searchBar)
.alpha(finalSearchBarAlpha).withLayer();
+ searchBarAlpha.addListener(new AlphaUpdateListener(searchBar));
+
Animator overviewPanelAlpha = new LauncherViewPropertyAnimator(overviewPanel)
.alpha(finalOverviewPanelAlpha).withLayer();
-
- pageIndicatorAlpha.addListener(new AlphaUpdateListener(pageIndicator));
- hotseatAlpha.addListener(new AlphaUpdateListener(hotseat));
- searchBarAlpha.addListener(new AlphaUpdateListener(searchBar));
overviewPanelAlpha.addListener(new AlphaUpdateListener(overviewPanel));
if (workspaceToOverview) {