summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2016-07-27 16:56:37 -0700
committerAdam Cohen <adamcohen@google.com>2016-07-27 17:00:20 -0700
commit2a82afd6f6a26950b9f09863b2e692f38a4ec678 (patch)
treee8e9248a52cfcf3d7e97c915206cf8c78495c344 /src
parent75df256cc14baf9e6b2d5f786cf06b56b0c800be (diff)
downloadandroid_packages_apps_Trebuchet-2a82afd6f6a26950b9f09863b2e692f38a4ec678.tar.gz
android_packages_apps_Trebuchet-2a82afd6f6a26950b9f09863b2e692f38a4ec678.tar.bz2
android_packages_apps_Trebuchet-2a82afd6f6a26950b9f09863b2e692f38a4ec678.zip
Fade QSB with the workspace as the overlay enters
Change-Id: Iadab9d9f051a85f6772a5d54d38534fcf1b029d7
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/Workspace.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index f4c914e78..121acc6df 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);
}
/**