am 0d89e1d7: am ddd5aaaf: Merge "Perform null check in animation complete" into ub-now-porkchop

* commit '0d89e1d764216baf4e57f1dee7bbf7b3c462be97':
  Perform null check in animation complete
This commit is contained in:
Adam Cohen authored and Android Git Automerger committed 2014-09-18 15:33:21 +00:00
commit ebdb34f3cd
1 file changed
+5 -3
+5 -3
View File
@@ -3632,9 +3632,11 @@ public class Launcher extends Activity
}
// Reset page transforms
page.setTranslationX(0);
page.setTranslationY(0);
page.setAlpha(1);
if (page != null) {
page.setTranslationX(0);
page.setTranslationY(0);
page.setAlpha(1);
}
content.setCurrentPage(content.getNextPage());
mAppsCustomizeContent.updateCurrentPageScroll();