// TODO(adamcohen): figure out a final effect here. We may need to recommend
// different effects based on device performance. On at least one relatively high-end
// device I've tried, translating the launcher causes things to get quite laggy.
- setWorkspaceTranslation(Direction.X, transX, alpha);
- setHotseatTranslation(Direction.X, transX, alpha);
+ setWorkspaceTranslationAndAlpha(Direction.X, transX, alpha);
+ setHotseatTranslationAndAlpha(Direction.X, transX, alpha);
}
/**
* @param translation the amount of shift.
* @param alpha the alpha for the workspace page
*/
- public void setWorkspaceTranslation(Direction direction, float translation, float alpha) {
+ public void setWorkspaceTranslationAndAlpha(Direction direction, float translation, float alpha) {
Property<View, Float> property = direction.viewProperty;
mPageAlpha[direction.ordinal()] = alpha;
float finalAlpha = mPageAlpha[0] * mPageAlpha[1];
* @param translation the amound of shift.
* @param alpha the alpha for the hotseat page
*/
- public void setHotseatTranslation(Direction direction, float translation, float alpha) {
+ public void setHotseatTranslationAndAlpha(Direction direction, float translation, float alpha) {
Property<View, Float> property = direction.viewProperty;
property.set(mPageIndicator, translation);
property.set(mLauncher.getHotseat(), translation);
if (states.stateIsOverviewHidden) {
finalAlpha = 0f;
} else if(states.stateIsNormalHidden) {
- finalAlpha = FeatureFlags.LAUNCHER3_ALL_APPS_PULL_UP ? 1 : 0;
+ finalAlpha = (FeatureFlags.LAUNCHER3_ALL_APPS_PULL_UP &&
+ i == mWorkspace.getNextPage()) ? 1 : 0;
} else if (states.stateIsNormal && mWorkspaceFadeInAdjacentScreens) {
finalAlpha = (i == toPage || i < customPageCount) ? 1f : 0f;
} else {
mDecelInterpolator.getInterpolation(alpha))));
mAppsView.getContentView().setAlpha(alpha);
mAppsView.setTranslationY(progress);
- mWorkspace.setWorkspaceTranslation(Direction.Y,
+ mWorkspace.setWorkspaceTranslationAndAlpha(Direction.Y,
PARALLAX_COEFFICIENT * (-mShiftRange + progress),
mAccelInterpolator.getInterpolation(workspaceHotseatAlpha));
if (!mLauncher.getDeviceProfile().isVerticalBarLayout()) {
- mWorkspace.setHotseatTranslation(Direction.Y, -mShiftRange + progress,
+ mWorkspace.setHotseatTranslationAndAlpha(Direction.Y, -mShiftRange + progress,
mAccelInterpolator.getInterpolation(workspaceHotseatAlpha));
} else {
- mWorkspace.setHotseatTranslation(Direction.Y,
+ mWorkspace.setHotseatTranslationAndAlpha(Direction.Y,
PARALLAX_COEFFICIENT * (-mShiftRange + progress),
mAccelInterpolator.getInterpolation(workspaceHotseatAlpha));
}