PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 512093f3: am 16fa074d: am 1c00fd0b: Fix NPE when going to All Apps in landscape

Browse Source 
* commit '512093f3655a1970f1f05605deb219ef9d6ab957':
  Fix NPE when going to All Apps in landscape
This commit is contained in:
Michael Jurka
2014-02-14 20:54:18 +00:00
committed by Android Git Automerger
parent 0f39034b12 512093f365
commit dbd4b06db4
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/Workspace.java
+6 -4
View File
@@ -2235,20 +2235,22 @@ public class Workspace extends SmoothPagedView
if (pageIndicator != null) { if (pageIndicator != null) {
pageIndicatorAlpha = new LauncherViewPropertyAnimator(pageIndicator) pageIndicatorAlpha = new LauncherViewPropertyAnimator(pageIndicator)
.alpha(finalHotseatAndPageIndicatorAlpha).withLayer(); .alpha(finalHotseatAndPageIndicatorAlpha).withLayer();
pageIndicatorAlpha.addListener(new AlphaUpdateListener(pageIndicator));
} else { } else {
// create a dummy animation so we don't need to do null checks later // create a dummy animation so we don't need to do null checks later
pageIndicatorAlpha = ValueAnimator.ofFloat(0, 0); pageIndicatorAlpha = ValueAnimator.ofFloat(0, 0);
} }
Animator hotseatAlpha = new LauncherViewPropertyAnimator(hotseat) Animator hotseatAlpha = new LauncherViewPropertyAnimator(hotseat)
.alpha(finalHotseatAndPageIndicatorAlpha).withLayer(); .alpha(finalHotseatAndPageIndicatorAlpha).withLayer();
hotseatAlpha.addListener(new AlphaUpdateListener(hotseat));
Animator searchBarAlpha = new LauncherViewPropertyAnimator(searchBar) Animator searchBarAlpha = new LauncherViewPropertyAnimator(searchBar)
.alpha(finalSearchBarAlpha).withLayer(); .alpha(finalSearchBarAlpha).withLayer();
searchBarAlpha.addListener(new AlphaUpdateListener(searchBar));
Animator overviewPanelAlpha = new LauncherViewPropertyAnimator(overviewPanel) Animator overviewPanelAlpha = new LauncherViewPropertyAnimator(overviewPanel)
.alpha(finalOverviewPanelAlpha).withLayer(); .alpha(finalOverviewPanelAlpha).withLayer();
pageIndicatorAlpha.addListener(new AlphaUpdateListener(pageIndicator));
hotseatAlpha.addListener(new AlphaUpdateListener(hotseat));
searchBarAlpha.addListener(new AlphaUpdateListener(searchBar));
overviewPanelAlpha.addListener(new AlphaUpdateListener(overviewPanel)); overviewPanelAlpha.addListener(new AlphaUpdateListener(overviewPanel));
if (workspaceToOverview) { if (workspaceToOverview) {