diff options
author | Tony Wickham <twickham@google.com> | 2016-02-08 11:37:04 -0800 |
---|---|---|
committer | Tony Wickham <twickham@google.com> | 2016-02-08 11:37:19 -0800 |
commit | e0c332365604976d999eb25d4bdcc49ec75b7a1c (patch) | |
tree | 5f7a903ecf9bec5b5c902de95e1b79448a738a15 /src/com/android/launcher3/WorkspaceStateTransitionAnimation.java | |
parent | 3c4906949f9d7a978caa5ffe9dfe8e6e153876ef (diff) | |
download | android_packages_apps_Trebuchet-e0c332365604976d999eb25d4bdcc49ec75b7a1c.tar.gz android_packages_apps_Trebuchet-e0c332365604976d999eb25d4bdcc49ec75b7a1c.tar.bz2 android_packages_apps_Trebuchet-e0c332365604976d999eb25d4bdcc49ec75b7a1c.zip |
Tweak spring-loaded workspace.
- No page indicators in spring-loaded mode
- Don’t move workspace up as high
- Scale workspace at 90% instead of 80% on phones
- Increase speed of workspace -> spring-loaded -> workspace
- Widgets were being scaled down twice when dragging from widget picker
- Don't scale up icons when dragging (scaling other stuff down is enough)
- Make scrim less dark and panels more transparent
- Thin white border around page instead of highlight when hovering
Change-Id: I963e91c20d4c0340480d165e0f3b8064783c0cb2
Diffstat (limited to 'src/com/android/launcher3/WorkspaceStateTransitionAnimation.java')
-rw-r--r-- | src/com/android/launcher3/WorkspaceStateTransitionAnimation.java | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java index d32ce7377..c0eb7eda3 100644 --- a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java +++ b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java @@ -198,6 +198,7 @@ public class WorkspaceStateTransitionAnimation { @Thunk int mAllAppsTransitionTime; @Thunk int mOverviewTransitionTime; @Thunk int mOverlayTransitionTime; + @Thunk int mSpringLoadedTransitionTime; @Thunk boolean mWorkspaceFadeInAdjacentScreens; public WorkspaceStateTransitionAnimation(Launcher launcher, Workspace workspace) { @@ -209,6 +210,7 @@ public class WorkspaceStateTransitionAnimation { mAllAppsTransitionTime = res.getInteger(R.integer.config_allAppsTransitionTime); mOverviewTransitionTime = res.getInteger(R.integer.config_overviewTransitionTime); mOverlayTransitionTime = res.getInteger(R.integer.config_overlayTransitionTime); + mSpringLoadedTransitionTime = mOverlayTransitionTime / 2; mSpringLoadedShrinkFactor = res.getInteger(R.integer.config_workspaceSpringLoadShrinkPercentage) / 100f; mOverviewModeShrinkFactor = @@ -259,6 +261,9 @@ public class WorkspaceStateTransitionAnimation { return mAllAppsTransitionTime; } else if (states.workspaceToOverview || states.overviewToWorkspace) { return mOverviewTransitionTime; + } else if (mLauncher.mState == Launcher.State.WORKSPACE_SPRING_LOADED + || states.oldStateIsNormal && states.stateIsSpringLoaded) { + return mSpringLoadedTransitionTime; } else { return mOverlayTransitionTime; } @@ -282,8 +287,8 @@ public class WorkspaceStateTransitionAnimation { // Update the workspace state float finalBackgroundAlpha = (states.stateIsSpringLoaded || states.stateIsOverview) ? 1.0f : 0f; - float finalHotseatAndPageIndicatorAlpha = (states.stateIsNormal || states.stateIsSpringLoaded) ? - 1f : 0f; + float finalHotseatAlpha = (states.stateIsNormal || states.stateIsSpringLoaded) ? 1f : 0f; + float finalPageIndicatorAlpha = states.stateIsNormal ? 1f : 0f; float finalOverviewPanelAlpha = states.stateIsOverview ? 1f : 0f; float finalWorkspaceTranslationY = 0; @@ -393,7 +398,7 @@ public class WorkspaceStateTransitionAnimation { Animator pageIndicatorAlpha; if (pageIndicator != null) { pageIndicatorAlpha = new LauncherViewPropertyAnimator(pageIndicator) - .alpha(finalHotseatAndPageIndicatorAlpha).withLayer(); + .alpha(finalPageIndicatorAlpha).withLayer(); pageIndicatorAlpha.addListener(new AlphaUpdateListener(pageIndicator, accessibilityEnabled)); } else { @@ -402,7 +407,7 @@ public class WorkspaceStateTransitionAnimation { } LauncherViewPropertyAnimator hotseatAlpha = new LauncherViewPropertyAnimator(hotseat) - .alpha(finalHotseatAndPageIndicatorAlpha); + .alpha(finalHotseatAlpha); hotseatAlpha.addListener(new AlphaUpdateListener(hotseat, accessibilityEnabled)); LauncherViewPropertyAnimator overviewPanelAlpha = @@ -456,10 +461,10 @@ public class WorkspaceStateTransitionAnimation { } else { overviewPanel.setAlpha(finalOverviewPanelAlpha); AlphaUpdateListener.updateVisibility(overviewPanel, accessibilityEnabled); - hotseat.setAlpha(finalHotseatAndPageIndicatorAlpha); + hotseat.setAlpha(finalHotseatAlpha); AlphaUpdateListener.updateVisibility(hotseat, accessibilityEnabled); if (pageIndicator != null) { - pageIndicator.setAlpha(finalHotseatAndPageIndicatorAlpha); + pageIndicator.setAlpha(finalPageIndicatorAlpha); AlphaUpdateListener.updateVisibility(pageIndicator, accessibilityEnabled); } mWorkspace.updateCustomContentVisibility(); |