diff options
| author | Winson Chung <winsonc@google.com> | 2015-07-28 22:54:51 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-28 22:54:51 +0000 |
| commit | 687ae8483daad60dc60e884c031d2dd340ac7d4a (patch) | |
| tree | a3aadd0257f1f6c1b74ca010ae471628965392d3 /src/com/android/launcher3/WorkspaceStateTransitionAnimation.java | |
| parent | 40e89c1a43daf94ec6495d71c1f0b5933b6c9d47 (diff) | |
| parent | 946609f0ea70e1361dbe979af0e054d4c18b929b (diff) | |
| download | android_packages_apps_Trebuchet-687ae8483daad60dc60e884c031d2dd340ac7d4a.tar.gz android_packages_apps_Trebuchet-687ae8483daad60dc60e884c031d2dd340ac7d4a.tar.bz2 android_packages_apps_Trebuchet-687ae8483daad60dc60e884c031d2dd340ac7d4a.zip | |
am 946609f0: Merge "Fixing overview mode scale calculations." into ub-launcher3-burnaby
* commit '946609f0ea70e1361dbe979af0e054d4c18b929b':
Fixing overview mode scale calculations.
Diffstat (limited to 'src/com/android/launcher3/WorkspaceStateTransitionAnimation.java')
| -rw-r--r-- | src/com/android/launcher3/WorkspaceStateTransitionAnimation.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java index 5d16cd561..f5a1cc4b6 100644 --- a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java +++ b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java @@ -210,8 +210,9 @@ public class WorkspaceStateTransitionAnimation { mOverlayTransitionTime = res.getInteger(R.integer.config_overlayTransitionTime); mSpringLoadedShrinkFactor = res.getInteger(R.integer.config_workspaceSpringLoadShrinkPercentage) / 100f; + mOverviewModeShrinkFactor = + res.getInteger(R.integer.config_workspaceOverviewShrinkPercentage) / 100f; mWorkspaceScrimAlpha = res.getInteger(R.integer.config_workspaceScrimAlpha) / 100f; - mOverviewModeShrinkFactor = grid.getOverviewModeScale(Utilities.isRtl(res)); mWorkspaceFadeInAdjacentScreens = grid.shouldFadeAdjacentWorkspaceScreens(); } |