diff options
| author | Tony Wickham <twickham@google.com> | 2018-03-21 15:51:23 -0700 |
|---|---|---|
| committer | Tony Wickham <twickham@google.com> | 2018-03-21 15:53:11 -0700 |
| commit | a97f0f20cd6ad51b3e920c923d21148234e5f728 (patch) | |
| tree | 02bd72f113ea1941ae1958459ad8c7e5b86015bf /src/com/android/launcher3/WorkspaceStateTransitionAnimation.java | |
| parent | 81bd3f57cf85dc0267e752fd73555cd9a59c1ab1 (diff) | |
| download | android_packages_apps_Trebuchet-a97f0f20cd6ad51b3e920c923d21148234e5f728.tar.gz android_packages_apps_Trebuchet-a97f0f20cd6ad51b3e920c923d21148234e5f728.tar.bz2 android_packages_apps_Trebuchet-a97f0f20cd6ad51b3e920c923d21148234e5f728.zip | |
Support multiple Views of extra hotseat content
Also adjust workspace page indicator:
- Center vertically
- Rounded corners
Change-Id: I96c2f3da3522d70726f544126b516c33c8fb7bc8
Diffstat (limited to 'src/com/android/launcher3/WorkspaceStateTransitionAnimation.java')
| -rw-r--r-- | src/com/android/launcher3/WorkspaceStateTransitionAnimation.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java index 66ea4d48b..3a222c261 100644 --- a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java +++ b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java @@ -84,8 +84,10 @@ public class WorkspaceStateTransitionAnimation { float hotseatExtraAlpha = (elements & HOTSEAT_EXTRA) != 0 ? 1 : 0; propertySetter.setViewAlpha(mLauncher.getHotseat().getLayout(), hotseatIconsAlpha, pageAlphaProvider.interpolator); - propertySetter.setViewAlpha(UiFactory.getHotseatExtraContent(mLauncher.getHotseat()), - hotseatExtraAlpha, pageAlphaProvider.interpolator); + for (View hotseatExtraContent : UiFactory.getHotseatExtraContent(mLauncher.getHotseat())) { + propertySetter.setViewAlpha(hotseatExtraContent, hotseatExtraAlpha, + pageAlphaProvider.interpolator); + } propertySetter.setViewAlpha(mLauncher.getWorkspace().getPageIndicator(), hotseatIconsAlpha, pageAlphaProvider.interpolator); |