commit ca6741e9b76dcfe30879eb0126075e06141f4858
author android-build-team Robot <android-build-team-robot@google.com> Thu Feb 07 04:07:36 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Feb 07 04:07:36 2019 +0000
tree 3d8e74f7b4daec8091fbd79693e8ddc145fe7af7
parent f04350cf9e247613ab10297607de196047384363
parent 1d82cfb1f07df7bfd66065e5f7fa3f8458f48c2d

Snap for 5289249 from 1d82cfb1f07df7bfd66065e5f7fa3f8458f48c2d to qt-release

Change-Id: I02b2b90d63e72567916fb7028308b5229541cfa4

Android.mk

diff --git a/Android.mk b/Android.mk
index c7939eb..7a8ac69 100644
--- a/Android.mk
+++ b/Android.mk
@@ -127,6 +127,7 @@
 LOCAL_PRIVILEGED_MODULE := true
 LOCAL_PRODUCT_MODULE := true
 LOCAL_OVERRIDES_PACKAGES := Home Launcher2
+LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.launcher3
 
 LOCAL_FULL_LIBS_MANIFEST_FILES := $(LOCAL_PATH)/AndroidManifest-common.xml
 
@@ -157,6 +158,7 @@
 LOCAL_PRIVILEGED_MODULE := true
 LOCAL_PRODUCT_MODULE := true
 LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3 Launcher3QuickStep
+LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.launcher3
 
 LOCAL_FULL_LIBS_MANIFEST_FILES := \
     $(LOCAL_PATH)/AndroidManifest.xml \
@@ -275,6 +277,7 @@
 LOCAL_PRIVILEGED_MODULE := true
 LOCAL_PRODUCT_MODULE := true
 LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3 Launcher3QuickStep
+LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.launcher3
 
 LOCAL_FULL_LIBS_MANIFEST_FILES := \
     $(LOCAL_PATH)/go/AndroidManifest.xml \
@@ -320,6 +323,7 @@
 LOCAL_PACKAGE_NAME := Launcher3QuickStepGoIconRecents
 LOCAL_PRIVILEGED_MODULE := true
 LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3 Launcher3QuickStep
+LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.launcher3
 
 LOCAL_FULL_LIBS_MANIFEST_FILES := \
     $(LOCAL_PATH)/go/AndroidManifest.xml \

quickstep/src/com/android/quickstep/util/ClipAnimationHelper.java

diff --git a/quickstep/src/com/android/quickstep/util/ClipAnimationHelper.java b/quickstep/src/com/android/quickstep/util/ClipAnimationHelper.java
index 0dee203..5515e97 100644
--- a/quickstep/src/com/android/quickstep/util/ClipAnimationHelper.java
+++ b/quickstep/src/com/android/quickstep/util/ClipAnimationHelper.java
@@ -390,7 +390,6 @@
         public TransformParams setCurrentRectAndTargetAlpha(RectF currentRect, float targetAlpha) {
             this.currentRect = currentRect;
             this.targetAlpha = targetAlpha;
-            this.progress = 1;
             return this;
         }
 

quickstep/src/com/android/quickstep/views/LauncherRecentsView.java

diff --git a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
index ff85003..5c8f53c 100644
--- a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
@@ -222,7 +222,8 @@
                 mTempRect.top -= offsetY;
             }
             mTempRectF.set(mTempRect);
-            mTransformParams.setCurrentRectAndTargetAlpha(mTempRectF, taskView.getAlpha())
+            mTransformParams.setProgress(1f)
+                    .setCurrentRectAndTargetAlpha(mTempRectF, taskView.getAlpha())
                     .setSyncTransactionApplier(mSyncTransactionApplier);
             if (mRecentsAnimationWrapper.targetSet != null) {
                 mClipAnimationHelper.applyTransform(mRecentsAnimationWrapper.targetSet,