Merge branch 'ub-launcher3-master', build 5258802
Test: Manual
Bug:111697218 [Quickstep 1.1] Integrate PiP / Live Tiles into Quickstep
Bug:111698021 [Quickstep 1.1] Improve motion within Quickstep
Bug:111699315 [Quickstep 2] Improve Quickscrub / switch gesture
Bug:111926330 [Quickstep 2] Nav bar, gestures, edge-to-edge, and OEM updates
Bug:112324288 Pixel launcher keeps on crashing when trying to remove a widget
Bug:114136250 Have a more spartan RecentsActivity on android go
Bug:117332845 testPendingWidget_autoRestored is failing on TAP
Bug:118206886 Add fallback launcher mechanism
Bug:118319143 1Digital Wellbeing - Implement showing app's remaining time in Launcher
Bug:119500058 Tests switch Launcher to a state without icons
Bug:120628042 Add race condition repro tests
Bug:122262084 Expose Launcher grid customization options
Bug:122262946 Each app installed from playstore occupies new workspace
Bug:122345781 Inflation happens and a binder call during swipe up gesture, that may cause jank
Bug:122347746 Jank in app closing animation for Maps on taimen
Bug:122472687 Recents icon shape should change when theme changed.
Bug:122545624 Iconloaderlib: make createIconBitmap in BaseIconFactory a public method
Bug:122612839 Flash of old snapshot when swiping up
Bug:122662526 Test broken: can't swipe back from AllApps to Overview
Bug:122809947 [C2][F2] Launcher keeps restarting after Setup wizard, it impacts testing seriously.
Bug:65162781 Status bar gradient sometimes slides up when unlocking
Change-Id: I22774df74963efb9189ea2a8bf3cdace6361c988
diff --git a/Android.mk b/Android.mk
index 0477dab..a5e338f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -220,7 +220,9 @@
endif
LOCAL_PACKAGE_NAME := Launcher3QuickStep
LOCAL_PRIVILEGED_MODULE := true
+LOCAL_PRODUCT_MODULE := true
LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3
+LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.launcher3
LOCAL_RESOURCE_DIR := \
$(LOCAL_PATH)/quickstep/res \
diff --git a/CleanSpec.mk b/CleanSpec.mk
index b2c5266..f58158f 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -52,6 +52,7 @@
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/Launcher2.apk)
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Launcher2_intermediates)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/Launcher2.apk)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/Launcher3QuickStep)
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..a8c84eb
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,4 @@
+adamcohen@google.com
+hyunyoungs@google.com
+sunnygoyal@google.com
+winsonc@google.com
diff --git a/quickstep/src/com/android/quickstep/TaskUtils.java b/quickstep/src/com/android/quickstep/TaskUtils.java
index c2777e7..a680df8 100644
--- a/quickstep/src/com/android/quickstep/TaskUtils.java
+++ b/quickstep/src/com/android/quickstep/TaskUtils.java
@@ -147,7 +147,7 @@
RemoteAnimationTargetCompat[] targets, final ClipAnimationHelper inOutHelper) {
ClipAnimationHelper.TransformParams params = new ClipAnimationHelper.TransformParams()
.setSyncTransactionApplier(new SyncRtSurfaceTransactionApplierCompat(v));
-
+
final ValueAnimator appAnimator = ValueAnimator.ofFloat(0, 1);
appAnimator.setInterpolator(TOUCH_RESPONSE_INTERPOLATOR);
appAnimator.addUpdateListener(new MultiValueUpdateListener() {
diff --git a/quickstep/src/com/android/quickstep/util/ClipAnimationHelper.java b/quickstep/src/com/android/quickstep/util/ClipAnimationHelper.java
index 31de683..a82a2c5 100644
--- a/quickstep/src/com/android/quickstep/util/ClipAnimationHelper.java
+++ b/quickstep/src/com/android/quickstep/util/ClipAnimationHelper.java
@@ -416,3 +416,4 @@
}
}
}
+
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index ad63c24..63c6805 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -17,7 +17,6 @@
package com.android.quickstep.views;
import static android.widget.Toast.LENGTH_SHORT;
-
import static com.android.launcher3.BaseActivity.fromContext;
import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN;
import static com.android.launcher3.anim.Interpolators.LINEAR;