aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-20 03:08:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moving some state specific logic to subclass of LauncherState

Browse Source 
Bug: 67678570
Change-Id: I1316f91c9f19bd572e4a0da67a22fa8921e1dcf9
This commit is contained in:
Sunny Goyal
2017-10-19 16:15:09 -07:00
parent cac861068e
commit c99cb174c3
10 changed files with 277 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
View File

@@ -18,8 +18,6 @@ package com.android.launcher3;
import static com.android.launcher3.LauncherAnimUtils.DRAWABLE_ALPHA;
import static com.android.launcher3.LauncherAnimUtils.SCALE_PROPERTY;
import static com.android.launcher3.LauncherState.OVERVIEW;
import static com.android.launcher3.LauncherState.SPRING_LOADED;
import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
@@ -145,8 +143,6 @@ public class WorkspaceStateTransitionAnimation {
private final Launcher mLauncher;
private final Workspace mWorkspace;
private final float mSpringLoadedShrinkFactor;
private final float mOverviewModeShrinkFactor;
private final boolean mWorkspaceFadeInAdjacentScreens;
private float mNewScale;
@@ -157,9 +153,6 @@ public class WorkspaceStateTransitionAnimation {
DeviceProfile grid = mLauncher.getDeviceProfile();
Resources res = launcher.getResources();
mSpringLoadedShrinkFactor = mLauncher.getDeviceProfile().workspaceSpringLoadShrinkFactor;
mOverviewModeShrinkFactor =
res.getInteger(R.integer.config_workspaceOverviewShrinkPercentage) / 100f;
mWorkspaceScrimAlpha = res.getInteger(R.integer.config_workspaceScrimAlpha);
mWorkspaceFadeInAdjacentScreens = grid.shouldFadeAdjacentWorkspaceScreens();
}
@@ -188,17 +181,9 @@ public class WorkspaceStateTransitionAnimation {
// Update the workspace state
int finalBackgroundAlpha = state.hasScrim ? 255 : 0;
final float finalWorkspaceTranslationY;
if (state == OVERVIEW) {
mNewScale = mOverviewModeShrinkFactor;
finalWorkspaceTranslationY = mWorkspace.getOverviewModeTranslationY();
} else if (state == SPRING_LOADED) {
mNewScale = mSpringLoadedShrinkFactor;
finalWorkspaceTranslationY = mWorkspace.getSpringLoadedTranslationY();
} else {
mNewScale = 1f;
finalWorkspaceTranslationY = 0;
}
float[] scaleAndTranslationY = state.getWorkspaceScaleAndTranslation(mLauncher);
final float mNewScale = scaleAndTranslationY[0];
final float finalWorkspaceTranslationY = scaleAndTranslationY[1];
int toPage = mWorkspace.getPageNearestToCenterOfScreen();
final int childCount = mWorkspace.getChildCount();