diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2016-07-28 00:23:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-07-28 00:23:04 +0000 |
| commit | e117f53f3667238b17093fbb217f6daf963e50d0 (patch) | |
| tree | d0e1e97e09e27378fb12403d329926fcfd8a406b /src | |
| parent | d7380e210e0446a55fa2338e9676cf15abca113b (diff) | |
| parent | 2a82afd6f6a26950b9f09863b2e692f38a4ec678 (diff) | |
| download | android_packages_apps_Trebuchet-e117f53f3667238b17093fbb217f6daf963e50d0.tar.gz android_packages_apps_Trebuchet-e117f53f3667238b17093fbb217f6daf963e50d0.tar.bz2 android_packages_apps_Trebuchet-e117f53f3667238b17093fbb217f6daf963e50d0.zip | |
Merge "Fade QSB with the workspace as the overlay enters" into ub-launcher3-calgary
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/Workspace.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 4ed2467eb..3c057e6fd 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -230,6 +230,8 @@ public class Workspace extends PagedView public static final int QSB_ALPHA_INDEX_STATE_CHANGE = 0; public static final int QSB_ALPHA_INDEX_Y_TRANSLATION = 1; public static final int QSB_ALPHA_INDEX_PAGE_SCROLL = 2; + public static final int QSB_ALPHA_INDEX_OVERLAY_SCROLL = 3; + MultiStateAlphaController mQsbAlphaController; @@ -482,7 +484,7 @@ public class Workspace extends PagedView public void initParentViews(View parent) { super.initParentViews(parent); mPageIndicator.setAccessibilityDelegate(new OverviewAccessibilityDelegate()); - mQsbAlphaController = new MultiStateAlphaController(mLauncher.getQsbContainer(), 3); + mQsbAlphaController = new MultiStateAlphaController(mLauncher.getQsbContainer(), 4); } private int getDefaultPage() { @@ -1465,6 +1467,8 @@ public class Workspace extends PagedView setWorkspaceTranslationAndAlpha(Direction.X, transX, alpha); setHotseatTranslationAndAlpha(Direction.X, transX, alpha); onWorkspaceOverallScrollChanged(); + + mQsbAlphaController.setAlphaAtIndex(alpha, QSB_ALPHA_INDEX_OVERLAY_SCROLL); } /** |