diff options
author | Kevin F. Haggerty <haggertk@lineageos.org> | 2020-06-06 10:04:42 -0600 |
---|---|---|
committer | Kevin F. Haggerty <haggertk@lineageos.org> | 2020-06-06 10:05:30 -0600 |
commit | 0c062179a89e047d778925412632473005a2ec43 (patch) | |
tree | 639916800e76ccf6b5e9b371d3a1c0cb083486d0 /quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandler.java | |
parent | b0838b261a6fb447fe9c4cf2513236a0736be209 (diff) | |
parent | 09bdbebdd2c93123a5d418de56053cc1c279afee (diff) | |
download | android_packages_apps_Trebuchet-0c062179a89e047d778925412632473005a2ec43.tar.gz android_packages_apps_Trebuchet-0c062179a89e047d778925412632473005a2ec43.tar.bz2 android_packages_apps_Trebuchet-0c062179a89e047d778925412632473005a2ec43.zip |
Merge tag 'android-10.0.0_r37' into staging/lineage-17.1_merge-android-10.0.0_r37lineage-17.1
Android 10.0.0 Release 37 (QQ3A.200605.001)
* tag 'android-10.0.0_r37':
[DO NOT MERGE] Enable APP_SEARCH_IMPROVEMENTS flag.
Ensure current animation is cancelled before building new folder animation.
Fixes ag/10573640 on qt-future-dev branch.
[DO NOT MERGE] Adds basic smart-folder logging.
[DO NOT MERGE] Support blacklisting live wallpapers from showing sysui scrims
Import translations. DO NOT MERGE
Revert "[DO NOT MERGE] Turn off FOLDER_NAME_SUGGEST feature flag"
[DO NOT MERGE] Initiailize APP_SEARCH_IMRPOVEMENT flag outside DEBUG builds.
[DO NOT MERGE] Adds fling gesture suppression to Launcher
Dismisses system overlays for Home intent.
[DO NOT MERGE] Fix some visual jumps when swiping home
[DO NOT MERGE] Turn off FOLDER_NAME_SUGGEST feature flag Bug: 150788630
[DO NOT MERGE] Prevent hotseat touch hijack
Change-Id: I2316620bda33d83d668c8727e728af09db3e3e4c
Diffstat (limited to 'quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandler.java')
-rw-r--r-- | quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandler.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandler.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandler.java index 5cce53ebf..e5d2b411a 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandler.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandler.java @@ -386,6 +386,10 @@ public abstract class BaseSwipeUpHandler<T extends BaseDraggingActivity, Q exten // rounding at the end of the animation. float startRadius = mClipAnimationHelper.getCurrentCornerRadius(); float endRadius = startRect.width() / 6f; + + float startTransformProgress = mTransformParams.getProgress(); + float endTransformProgress = 1; + // We want the window alpha to be 0 once this threshold is met, so that the // FolderIconView can be seen morphing into the icon shape. final float windowAlphaThreshold = isFloatingIconView ? 1f - SHAPE_PROGRESS_DURATION : 1f; @@ -409,7 +413,8 @@ public abstract class BaseSwipeUpHandler<T extends BaseDraggingActivity, Q exten public void onUpdate(RectF currentRect, float progress) { homeAnim.setPlayFraction(progress); - mTransformParams.setProgress(progress) + mTransformParams.setProgress( + Utilities.mapRange(progress, startTransformProgress, endTransformProgress)) .setCurrentRectAndTargetAlpha(currentRect, getWindowAlpha(progress)); if (isFloatingIconView) { mTransformParams.setCornerRadius(endRadius * progress + startRadius |