diff options
-rw-r--r-- | src/com/android/launcher3/AppsCustomizeTabHost.java | 3 | ||||
-rw-r--r-- | src/com/android/launcher3/Workspace.java | 25 |
2 files changed, 17 insertions, 11 deletions
diff --git a/src/com/android/launcher3/AppsCustomizeTabHost.java b/src/com/android/launcher3/AppsCustomizeTabHost.java index 89e74b218..f034183e0 100644 --- a/src/com/android/launcher3/AppsCustomizeTabHost.java +++ b/src/com/android/launcher3/AppsCustomizeTabHost.java @@ -439,6 +439,7 @@ public class AppsCustomizeTabHost extends TabHost implements LauncherTransitiona ViewGroup parent = (ViewGroup) getParent(); if (parent == null) return; + View overviewPanel = ((Launcher) getContext()).getOverviewPanel(); final int count = parent.getChildCount(); if (!isChildrenDrawingOrderEnabled()) { for (int i = 0; i < count; i++) { @@ -446,7 +447,7 @@ public class AppsCustomizeTabHost extends TabHost implements LauncherTransitiona if (child == this) { break; } else { - if (child.getVisibility() == GONE) { + if (child.getVisibility() == GONE || child == overviewPanel) { continue; } child.setVisibility(visibility); diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 53a6b6868..063a256a9 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -1911,7 +1911,9 @@ public class Workspace extends SmoothPagedView } } - View searchBar = mLauncher.getQsbBar(); + final View searchBar = mLauncher.getQsbBar(); + final View overviewPanel = mLauncher.getOverviewPanel(); + final View hotseat = mLauncher.getHotseat(); if (animated) { LauncherViewPropertyAnimator scale = new LauncherViewPropertyAnimator(this); scale.scaleX(mNewScale) @@ -1957,29 +1959,32 @@ public class Workspace extends SmoothPagedView pageIndicatorAlpha = ObjectAnimator.ofFloat(getPageIndicator(), "alpha", finalHotseatAndPageIndicatorAlpha); } - ObjectAnimator hotseatAlpha = ObjectAnimator.ofFloat(mLauncher.getHotseat(), "alpha", + ObjectAnimator hotseatAlpha = ObjectAnimator.ofFloat(hotseat, "alpha", finalHotseatAndPageIndicatorAlpha); ObjectAnimator searchBarAlpha = ObjectAnimator.ofFloat(searchBar, "alpha", finalSearchBarAlpha); - ObjectAnimator overviewPanelAlpha = ObjectAnimator.ofFloat(mLauncher.getOverviewPanel(), + ObjectAnimator overviewPanelAlpha = ObjectAnimator.ofFloat(overviewPanel, "alpha", finalOverviewPanelAlpha); - overviewPanelAlpha.addUpdateListener(new AlphaUpdateListener( - mLauncher.getOverviewPanel())); - hotseatAlpha.addUpdateListener(new AlphaUpdateListener(mLauncher.getHotseat())); + + overviewPanelAlpha.addUpdateListener(new AlphaUpdateListener(overviewPanel)); + hotseatAlpha.addUpdateListener(new AlphaUpdateListener(hotseat)); searchBarAlpha.addUpdateListener(new AlphaUpdateListener(searchBar)); + if (getPageIndicator() != null) { pageIndicatorAlpha.addUpdateListener(new AlphaUpdateListener(getPageIndicator())); } + + anim.play(overviewPanelAlpha); anim.play(hotseatAlpha); anim.play(searchBarAlpha); anim.play(pageIndicatorAlpha); anim.setStartDelay(delay); } else { - mLauncher.getOverviewPanel().setAlpha(finalOverviewPanelAlpha); - AlphaUpdateListener.updateVisibility(mLauncher.getOverviewPanel()); - mLauncher.getHotseat().setAlpha(finalHotseatAndPageIndicatorAlpha); - AlphaUpdateListener.updateVisibility(mLauncher.getHotseat()); + overviewPanel.setAlpha(finalOverviewPanelAlpha); + AlphaUpdateListener.updateVisibility(overviewPanel); + hotseat.setAlpha(finalHotseatAndPageIndicatorAlpha); + AlphaUpdateListener.updateVisibility(hotseat); if (getPageIndicator() != null) { getPageIndicator().setAlpha(finalHotseatAndPageIndicatorAlpha); AlphaUpdateListener.updateVisibility(getPageIndicator()); |