Merging ub-launcher3-master, build 5429374
Test: Manual **
Bug:111926330 [Quickstep 2] Nav bar, gestures, edge-to-edge, and OEM updates
Bug:114136250 Have a more spartan RecentsActivity on android go
Bug:118085499 UI looks different for Contacts widgets in widget screen
Bug:122843905 Polish app opening transition
Bug:126596417 [Gesture Nav] Can't quick switch from home screen
Bug:128129398 Navigation bar should be at the bottom in landscape
Bug:128348746 Gestural Nav enable/disable state should be logged to pixel launcher clearcut logging
Bug:128531133 Make TAPL diagnostics clearer
Bug:129146690 [Gesture Nav] Rounded Corners on Pixel (sailfish) flicker during Quickswitch
Bug:129328259 [Regression] Suspended app icons turn full colour during open animation
Bug:129434166 Lab-only flake: drag to workspace doesn't happen
Bug:129474866 Gesture nav crash: Can't set scaleX to infinity
Bug:129571305 [Fully Gestural Navigation] Go home on swipe up from Recents and App Drawer
Bug:129697378 [Many tests broken, PTL ASAP] "Can't detect navigation mode"Merge branch 'ub-launcher3-master' into merge_5429374
Change-Id: I458c40075bc40d22f658e02ea0673d1de452f3ce
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..98dfb8a
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,14 @@
+# Use this reviewer by default.
+# gnl-eng@google.com (Googlers only)
+
+# People who can approve changes for submission
+adamcohen@google.com
+hyunyoungs@google.com
+sunnygoyal@google.com
+winsonc@google.com
+
+# Source of truth of this directory is actually in launcher team's
+# unbundled branch ub-launcher3-[release variant] (e.g., master, edmonton).
+# Pls try to wait for one of the owner's review if you have to force
+# submit (e.g., for large refactor, breakage, etc) as we may want to
+# cherry pick the change to our active developmental branch.
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/OverviewInputConsumer.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/OverviewInputConsumer.java
index 7794d8d..3ebe968 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/OverviewInputConsumer.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/OverviewInputConsumer.java
@@ -159,4 +159,4 @@
}
return new OverviewInputConsumer(activity, startingInActivityBounds);
}
-}
\ No newline at end of file
+}
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/ClipAnimationHelper.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/ClipAnimationHelper.java
index 4450b4b..fe5a675 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/ClipAnimationHelper.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/ClipAnimationHelper.java
@@ -386,3 +386,4 @@
}
}
}
+
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java
index bea705f..747c480 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/recents_ui_overrides/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.QuickstepAppTransitionManagerImpl.RECENTS_LAUNCH_DURATION;
import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN;