diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2018-05-22 22:58:25 +0000 |
|---|---|---|
| committer | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2018-05-22 22:58:25 +0000 |
| commit | 9a6b5ec050eedc241a31fc4dac07b9827b7f6ab1 (patch) | |
| tree | dc543abc4060d9934f853af6f4121cafb0f10472 /src/com/android/launcher3/allapps | |
| parent | 5e42a7239cdc155af8b7935b487e2a7786fbcd46 (diff) | |
| parent | 56e1019e95a502fbc8144a6ba651095c0e12def1 (diff) | |
| download | android_packages_apps_Trebuchet-9a6b5ec050eedc241a31fc4dac07b9827b7f6ab1.tar.gz android_packages_apps_Trebuchet-9a6b5ec050eedc241a31fc4dac07b9827b7f6ab1.tar.bz2 android_packages_apps_Trebuchet-9a6b5ec050eedc241a31fc4dac07b9827b7f6ab1.zip | |
[automerger] Making caret visibility part of state definition am: 56e1019e95
Change-Id: I7fbb0c18f38a25ef858eebf2115bb55f3ce079ac
Diffstat (limited to 'src/com/android/launcher3/allapps')
| -rw-r--r-- | src/com/android/launcher3/allapps/AllAppsTransitionController.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java index 2c3e3ee7b..ccd55863c 100644 --- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java +++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java @@ -4,6 +4,7 @@ import static com.android.launcher3.LauncherState.ALL_APPS_CONTENT; import static com.android.launcher3.LauncherState.ALL_APPS_HEADER; import static com.android.launcher3.LauncherState.ALL_APPS_HEADER_EXTRA; import static com.android.launcher3.LauncherState.OVERVIEW; +import static com.android.launcher3.LauncherState.VERTICAL_SWIPE_INDICATOR; import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_OVERVIEW_SCALE; import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_VERTICAL_PROGRESS; import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN; @@ -198,6 +199,9 @@ public class AllAppsTransitionController implements StateHandler, OnDeviceProfil setter.setViewAlpha(mAppsView.getContentView(), hasContent ? 1 : 0, LINEAR); setter.setViewAlpha(mAppsView.getScrollBar(), hasContent ? 1 : 0, LINEAR); mAppsView.getFloatingHeaderView().setContentVisibility(hasHeaderExtra, hasContent, setter); + + setter.setInt(mScrimView, ScrimView.DRAG_HANDLE_ALPHA, + (visibleElements & VERTICAL_SWIPE_INDICATOR) != 0 ? 255 : 0, LINEAR); } public AnimatorListenerAdapter getProgressAnimatorListener() { |