Merge "Verifying that new applications are added and fixing issue with new items getting wrong ids." into jb-ub-gel-agar

This commit is contained in:
Winson Chung authored and Android (Google) Code Review committed 2013-07-31 17:34:54 +00:00
commit 63d7870ea2
7 files changed
+299 -165

No files matched your search

+7 -1
View File
@@ -1319,7 +1319,13 @@ public class Workspace extends SmoothPagedView
progress = Math.max(0, progress);
setBackgroundAlpha(progress * 0.8f);
float transY = progress * (getViewportHeight() - getPageIndicator().getTop());
float height = getViewportHeight();
if (getPageIndicator() != null) {
height -= getPageIndicator().getTop();
} else if (mLauncher.getHotseat() != null) {
height -= mLauncher.getHotseat().getTop();
}
float transY = progress * height;
if (mLauncher.getHotseat() != null) {
mLauncher.getHotseat().setTranslationY(transY);