Changes for June 2023, syncing up to 20230614

patches_platform_personal/packages_apps_Trebuchet/0001-Trebuchet-Make-overview-scrim-transparent-again.patch

@@ -1,4 +1,4 @@
-From 1f218b4e6572822d99ec46c1bfd65e7ff023c0d3 Mon Sep 17 00:00:00 2001
+From f32dde0ff88ec58029be1fe4a1b42b94ff1bdbab Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Thu, 28 Oct 2021 02:30:59 +0000
 Subject: [PATCH 1/2] Trebuchet: Make overview scrim transparent again
@@ -7,18 +7,18 @@ Also revert texts/buttons to workspace color
 
 Change-Id: I78c84865eb06b8e59c9c271cd2e267ae4cd7cc08
 ---
- quickstep/res/values/styles.xml                            | 4 ++--
+ quickstep/res/values/styles.xml                            | 2 +-
  quickstep/src/com/android/quickstep/views/RecentsView.java | 2 +-
  res/color-v31/overview_scrim.xml                           | 2 +-
  res/color-v31/overview_scrim_dark.xml                      | 2 +-
  res/color/overview_button.xml                              | 6 +++---
- 5 files changed, 8 insertions(+), 8 deletions(-)
+ 5 files changed, 7 insertions(+), 7 deletions(-)
 
 diff --git a/quickstep/res/values/styles.xml b/quickstep/res/values/styles.xml
-index 7225220876..59cce932a2 100644
+index 8eea37f6c2..623f60f81a 100644
 --- a/quickstep/res/values/styles.xml
 +++ b/quickstep/res/values/styles.xml
-@@ -142,7 +142,7 @@
+@@ -176,7 +176,7 @@
          parent="@android:style/Widget.DeviceDefault.Button.Borderless">
          <item name="android:textColor">@color/overview_button</item>
          <item name="android:drawableTint">@color/overview_button</item>
@@ -27,18 +27,11 @@ index 7225220876..59cce932a2 100644
          <item name="android:drawablePadding">8dp</item>
          <item name="android:textAllCaps">false</item>
      </style>
-@@ -182,4 +182,4 @@
-         <item name="android:textSize">24sp</item>
-         <item name="android:lines">2</item>
-     </style>
--</resources>
-\ No newline at end of file
-+</resources>
 diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
-index 4a4202ecc6..58e8c2508a 100644
+index 9222e456e5..678c0dfd80 100644
 --- a/quickstep/src/com/android/quickstep/views/RecentsView.java
 +++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
-@@ -717,7 +717,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
+@@ -783,7 +783,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
          mEmptyIcon.setCallback(this);
          mEmptyMessage = context.getText(R.string.recents_empty_message);
          mEmptyMessagePaint = new TextPaint();
@@ -89,5 +82,5 @@ index aa48b78604..e638ac2d4a 100644
 \ No newline at end of file
 +</selector>
 -- 
-2.25.1
+2.34.1
 

patches_platform_personal/packages_apps_Trebuchet/0002-Trebuchet-Kill-haptics-in-recents.patch

@@ -1,4 +1,4 @@
-From 3b51af674b9aa916e86fcfe0034ba3dfc0359ae1 Mon Sep 17 00:00:00 2001
+From c04fae6b45b624a39d684c4b6cf02440a3fe83b5 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Fri, 18 Mar 2022 08:42:18 +0000
 Subject: [PATCH 2/2] Trebuchet: Kill haptics in recents
@@ -13,14 +13,14 @@ Change-Id: Ie3b0eabe8cc0421e696720740edc492cae2f5153
  3 files changed, 32 deletions(-)
 
 diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
-index 53dc9dd873..c8d89edb97 100644
+index 847114a960..eef4be2964 100644
 --- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
 +++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
-@@ -429,14 +429,6 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
+@@ -419,14 +419,6 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
              nonOverviewAnim.setFloatValues(startProgress, endProgress);
              mNonOverviewAnim.dispatchOnStart();
          }
--        if (targetState == QUICK_SWITCH) {
+-        if (targetState == QUICK_SWITCH_FROM_HOME) {
 -            // Navigating to quick switch, add scroll feedback since the first time is not
 -            // considered a scroll by the RecentsView.
 -            VibratorWrapper.INSTANCE.get(mLauncher).vibrate(
@@ -32,10 +32,10 @@ index 53dc9dd873..c8d89edb97 100644
          nonOverviewAnim.setDuration(Math.max(xDuration, yDuration));
          mNonOverviewAnim.setEndAction(() -> onAnimationToStateCompleted(targetState));
 diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
-index ca7f633bbc..61ee609535 100644
+index eddc50c64f..09f253b08d 100644
 --- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
 +++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
-@@ -367,11 +367,6 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity>
+@@ -369,11 +369,6 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity>
          mCurrentAnimation.startWithVelocity(mActivity, goingToEnd,
                  velocity * orientationHandler.getSecondaryTranslationDirectionFactor(),
                  mEndDisplacement, animationDuration);
@@ -48,10 +48,10 @@ index ca7f633bbc..61ee609535 100644
  
      private void clearState() {
 diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
-index 58e8c2508a..786db49be5 100644
+index 678c0dfd80..8e75a7c18d 100644
 --- a/quickstep/src/com/android/quickstep/views/RecentsView.java
 +++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
-@@ -1339,25 +1339,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
+@@ -1466,25 +1466,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
          }
      }
  
@@ -78,5 +78,5 @@ index 58e8c2508a..786db49be5 100644
      protected void determineScrollingStart(MotionEvent ev, float touchSlopScale) {
          // Enables swiping to the left or right only if the task overlay is not modal.
 -- 
-2.25.1
+2.34.1