summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2019-07-25 04:12:49 (GMT)
committerandroid-build-team Robot <android-build-team-robot@google.com>2019-07-25 04:12:49 (GMT)
commit72b4b224430f50a897bdbc1d2a805243bc032da7 (patch)
treec0da37f5f20978bf392cafa0ddf1f9322d87c9c5
parent831267c6a7cff1871a28ca97a7ea3af2d6b809ec (diff)
parent55ab9851a4af963d45344dc936eea62f540169c0 (diff)
downloadandroid_packages_apps_Trebuchet-72b4b224430f50a897bdbc1d2a805243bc032da7.zip
android_packages_apps_Trebuchet-72b4b224430f50a897bdbc1d2a805243bc032da7.tar.gz
android_packages_apps_Trebuchet-72b4b224430f50a897bdbc1d2a805243bc032da7.tar.bz2
Merge cherrypicks of [8828839, 8824129, 8828883, 8828885, 8828888, 8828891, 8829076, 8828998, 8828999, 8828607, 8828957] into qt-release
Change-Id: I529b9190a4c234124cd5f32cf4b1ddabebda18cd
-rw-r--r--quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java5
-rw-r--r--src/com/android/launcher3/Launcher.java10
2 files changed, 11 insertions, 4 deletions
diff --git a/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java b/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
index 44324cb..b60a017 100644
--- a/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
+++ b/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
@@ -32,6 +32,7 @@ import static com.android.launcher3.dragndrop.DragLayer.ALPHA_INDEX_TRANSITIONS;
import static com.android.launcher3.views.FloatingIconView.SHAPE_PROGRESS_DURATION;
import static com.android.quickstep.TaskUtils.taskIsATargetWithMode;
import static com.android.systemui.shared.system.QuickStepContract.getWindowCornerRadius;
+import static com.android.systemui.shared.system.QuickStepContract.supportsRoundedCornersOnWindows;
import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.MODE_CLOSING;
import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.MODE_OPENING;
@@ -495,6 +496,8 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
endCrop = windowTargetBounds.height();
}
+ final float initialWindowRadius = supportsRoundedCornersOnWindows(mLauncher.getResources())
+ ? startCrop / 2f : 0f;
final float windowRadius = mDeviceProfile.isMultiWindowMode
? 0 : getWindowCornerRadius(mLauncher.getResources());
appAnimator.addUpdateListener(new MultiValueUpdateListener() {
@@ -506,7 +509,7 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
alphaDuration, LINEAR);
FloatProp mCroppedSize = new FloatProp(startCrop, endCrop, 0, CROP_DURATION,
EXAGGERATED_EASE);
- FloatProp mWindowRadius = new FloatProp(startCrop / 2f, windowRadius, 0,
+ FloatProp mWindowRadius = new FloatProp(initialWindowRadius, windowRadius, 0,
RADIUS_DURATION, EXAGGERATED_EASE);
@Override
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index d9af4da..bc3aa7e 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -952,10 +952,14 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns,
mHandler.removeCallbacks(mHandleDeferredResume);
Utilities.postAsyncCallback(mHandler, mHandleDeferredResume);
- for (OnResumeCallback cb : mOnResumeCallbacks) {
- cb.onLauncherResume();
+ if (!mOnResumeCallbacks.isEmpty()) {
+ final ArrayList<OnResumeCallback> resumeCallbacks = new ArrayList<>(mOnResumeCallbacks);
+ mOnResumeCallbacks.clear();
+ for (int i = resumeCallbacks.size() - 1; i >= 0; i--) {
+ resumeCallbacks.get(i).onLauncherResume();
+ }
+ resumeCallbacks.clear();
}
- mOnResumeCallbacks.clear();
if (mLauncherCallbacks != null) {
mLauncherCallbacks.onResume();